diff --git a/internal/cmd/clusters.go b/internal/cmd/clusters.go index 1f5a1fe..d8b81c7 100644 --- a/internal/cmd/clusters.go +++ b/internal/cmd/clusters.go @@ -28,7 +28,7 @@ func init() { flag.StringVar(&clustersInventoryFile, "inventory-file", inventoryFilePath(), "Path to the inventory file that should be used by this command.") flag.StringArrayVar(&clustersExcludePatterns, "exclude-cluster", nil, "Exclude clusters matching the given wildcard pattern. Can be specified multiple times to exclude multiple patterns.") flag.Func("fact-selector", "Label selector to filter clusters based on their facts. Example: 'distribution=openshift4,release_channel=fast'", selectorFlagFunc(&clustersFactSelector)) - flag.Func("dynamic-fact-selector", "Label selector to filter clusters based on their dynamic facts. Example: 'distribution=openshift4,release_channel=fast'", selectorFlagFunc(&clustersDynamicFactSelector)) + flag.Func("dynamic-fact-selector", "Label selector to filter clusters based on their dynamic facts. Example: 'openshiftBaseDomain in (cloudscale-lpg-2.appuio.cloud,exoscale-ch-gva-2-0.appuio.cloud)'", selectorFlagFunc(&clustersDynamicFactSelector)) flag.VarP(&clustersOutputValue{val: &clustersOutputFormat}, "output", "o", "Output format. One of: table, json.") must(clustersCmd.RegisterFlagCompletionFunc("output", cobra.FixedCompletions([]string{"table", "json"}, cobra.ShellCompDirectiveNoFileComp))) must(clustersCmd.RegisterFlagCompletionFunc("exclude-cluster", completion.ClusterID(clustersInventoryFile, true, nil))) diff --git a/internal/cmd/kubeconfig.go b/internal/cmd/kubeconfig.go index a8cdb7f..87b1f2b 100644 --- a/internal/cmd/kubeconfig.go +++ b/internal/cmd/kubeconfig.go @@ -37,7 +37,7 @@ func init() { flag.StringVar(&proxyAddr, "proxy-addr", defaultProxyAddr, "Address of the proxy to use in the generated kubeconfig file.") flag.StringArrayVar(&clustersExcludePatterns, "exclude-cluster", nil, "Exclude clusters matching the given wildcard pattern. Can be specified multiple times to exclude multiple patterns.") flag.Func("fact-selector", "Label selector to filter clusters based on their facts. Example: 'distribution=openshift4,release_channel=fast'", selectorFlagFunc(&clustersFactSelector)) - flag.Func("dynamic-fact-selector", "Label selector to filter clusters based on their dynamic facts. Example: 'distribution=openshift4,release_channel=fast'", selectorFlagFunc(&clustersDynamicFactSelector)) + flag.Func("dynamic-fact-selector", "Label selector to filter clusters based on their dynamic facts. Example: 'openshiftBaseDomain in (cloudscale-lpg-2.appuio.cloud,exoscale-ch-gva-2-0.appuio.cloud)'", selectorFlagFunc(&clustersDynamicFactSelector)) must(kubeconfigCmd.RegisterFlagCompletionFunc("exclude-cluster", completion.ClusterID(clustersInventoryFile, true, nil))) } diff --git a/internal/cmd/shell.go b/internal/cmd/shell.go index 5a828e4..7bd2062 100644 --- a/internal/cmd/shell.go +++ b/internal/cmd/shell.go @@ -98,7 +98,7 @@ func newShellCmd() *cobra.Command { flag.StringSliceVar(&flags.ClusterExcludePatterns, "exclude-cluster", nil, "Exclude clusters matching the given patterns. Supports wildcards, e.g. `--exclude-cluster=c-dev-*` to exclude all clusters starting with `c-dev-`. This flag can be used multiple times to exclude multiple patterns. Useful in combination with --each to exclude certain clusters from the per-cluster execution.") must(cmd.RegisterFlagCompletionFunc("exclude-cluster", completion.ClusterID(flags.InventoryFile, true, nil))) flag.Func("fact-selector", "Label selector to filter clusters based on their facts. Example: 'distribution=openshift4,release_channel=fast'", selectorFlagFunc(&flags.FactSelector)) - flag.Func("dynamic-fact-selector", "Label selector to filter clusters based on their dynamic facts. Example: 'distribution=openshift4,release_channel=fast'", selectorFlagFunc(&flags.DynamicFactSelector)) + flag.Func("dynamic-fact-selector", "Label selector to filter clusters based on their dynamic facts. Example: 'openshiftBaseDomain in (cloudscale-lpg-2.appuio.cloud,exoscale-ch-gva-2-0.appuio.cloud)'", selectorFlagFunc(&flags.DynamicFactSelector)) return cmd } diff --git a/internal/cmd/test.go b/internal/cmd/test.go index 38d101e..1466449 100644 --- a/internal/cmd/test.go +++ b/internal/cmd/test.go @@ -42,7 +42,7 @@ func init() { flag.StringVar(&proxyMappingFile, "mapping-file", proxyMappingFilePath(), "Path to the domain to jumphost mapping file. This file can be generated with the `update` subcommand.") flag.StringArrayVar(&clustersExcludePatterns, "exclude-cluster", nil, "Exclude clusters matching the given wildcard pattern. Can be specified multiple times to exclude multiple patterns.") flag.Func("fact-selector", "Label selector to filter clusters based on their facts. Example: 'distribution=openshift4,release_channel=fast'", selectorFlagFunc(&clustersFactSelector)) - flag.Func("dynamic-fact-selector", "Label selector to filter clusters based on their dynamic facts. Example: 'distribution=openshift4,release_channel=fast'", selectorFlagFunc(&clustersDynamicFactSelector)) + flag.Func("dynamic-fact-selector", "Label selector to filter clusters based on their dynamic facts. Example: 'openshiftBaseDomain in (cloudscale-lpg-2.appuio.cloud,exoscale-ch-gva-2-0.appuio.cloud)'", selectorFlagFunc(&clustersDynamicFactSelector)) must(testCmd.RegisterFlagCompletionFunc("exclude-cluster", completion.ClusterID(clustersInventoryFile, true, nil))) }