Created
July 15, 2019 18:10
-
-
Save wshearn/d591cb552972bc4ca1849dd53454a8ad to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/pkg/oc/cli/export/export.go b/pkg/oc/cli/export/export.go | |
index 6aa61129ab..e18af76a61 100644 | |
--- a/pkg/oc/cli/export/export.go | |
+++ b/pkg/oc/cli/export/export.go | |
@@ -107,7 +107,7 @@ func NewCmdExport(fullName string, f kcmdutil.Factory, streams genericclioptions | |
cmd.Flags().BoolVar(&o.Exact, "exact", o.Exact, "If true, preserve fields that may be cluster specific, such as service clusterIPs or generated names") | |
cmd.Flags().BoolVar(&o.Raw, "raw", o.Raw, "If true, do not alter the resources in any way after they are loaded.") | |
cmd.Flags().StringVarP(&o.Selector, "selector", "l", o.Selector, "Selector (label query) to filter on") | |
- cmd.Flags().BoolVar(&o.AllNamespaces, "all-namespaces", o.AllNamespaces, "If true, list the requested object(s) across all namespaces. Namespace in current context is ignored even if specified with --namespace.") | |
+ cmd.Flags().BoolVarP(&o.AllNamespaces, "all-namespaces", "A", o.AllNamespaces, "If true, list the requested object(s) across all namespaces. Namespace in current context is ignored even if specified with --namespace.") | |
cmd.Flags().Bool("all", true, "DEPRECATED: all is ignored, specifying a resource without a name selects all the instances of that resource") | |
cmd.Flags().MarkDeprecated("all", "all is ignored because specifying a resource without a name selects all the instances of that resource") | |
cmd.Flags().StringVar(&o.OutputVersion, "output-version", o.OutputVersion, "The preferred API versions of the output objects") | |
diff --git a/pkg/oc/cli/policy/cani/cani.go b/pkg/oc/cli/policy/cani/cani.go | |
index dc0914fbd3..eeca0b509e 100644 | |
--- a/pkg/oc/cli/policy/cani/cani.go | |
+++ b/pkg/oc/cli/policy/cani/cani.go | |
@@ -78,7 +78,7 @@ func NewCmdCanI(name, fullName string, f kcmdutil.Factory, streams genericcliopt | |
Deprecated: "use 'oc auth can-i'", | |
} | |
- cmd.Flags().BoolVar(&o.AllNamespaces, "all-namespaces", o.AllNamespaces, "If true, check the specified action in all namespaces.") | |
+ cmd.Flags().BoolVarP(&o.AllNamespaces, "all-namespaces", "A", o.AllNamespaces, "If true, check the specified action in all namespaces.") | |
cmd.Flags().BoolVar(&o.ListAll, "list", o.ListAll, "If true, list all the actions you can perform in a namespace, cannot be specified with --all-namespaces or a VERB RESOURCE") | |
cmd.Flags().BoolVarP(&o.Quiet, "quiet", "q", o.Quiet, "If true, suppress output and just return the exit code.") | |
cmd.Flags().BoolVar(&o.IgnoreScopes, "ignore-scopes", o.IgnoreScopes, "If true, disregard any scopes present on this request and evaluate considering full permissions.") | |
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/auth/cani.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/auth/cani.go | |
index 118f0876d4..aa192b3efb 100644 | |
--- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/auth/cani.go | |
+++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/auth/cani.go | |
@@ -106,7 +106,7 @@ func NewCmdCanI(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.C | |
}, | |
} | |
- cmd.Flags().BoolVar(&o.AllNamespaces, "all-namespaces", o.AllNamespaces, "If true, check the specified action in all namespaces.") | |
+ cmd.Flags().BoolVarP(&o.AllNamespaces, "all-namespaces", "A", o.AllNamespaces, "If true, check the specified action in all namespaces.") | |
cmd.Flags().BoolVarP(&o.Quiet, "quiet", "q", o.Quiet, "If true, suppress output and just return the exit code.") | |
cmd.Flags().StringVar(&o.Subresource, "subresource", o.Subresource, "SubResource such as pod/log or deployment/scale") | |
return cmd | |
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/clusterinfo_dump.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/clusterinfo_dump.go | |
index c4200b221a..bcf5140c3d 100644 | |
--- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/clusterinfo_dump.go | |
+++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/clusterinfo_dump.go | |
@@ -74,7 +74,7 @@ func NewCmdClusterInfoDump(f cmdutil.Factory, ioStreams genericclioptions.IOStre | |
} | |
cmd.Flags().StringVar(&o.OutputDir, "output-directory", o.OutputDir, i18n.T("Where to output the files. If empty or '-' uses stdout, otherwise creates a directory hierarchy in that directory")) | |
cmd.Flags().StringSliceVar(&o.Namespaces, "namespaces", o.Namespaces, "A comma separated list of namespaces to dump.") | |
- cmd.Flags().BoolVar(&o.AllNamespaces, "all-namespaces", o.AllNamespaces, "If true, dump all namespaces. If true, --namespaces is ignored.") | |
+ cmd.Flags().BoolVarP(&o.AllNamespaces, "all-namespaces", "A", o.AllNamespaces, "If true, dump all namespaces. If true, --namespaces is ignored.") | |
cmdutil.AddPodRunningTimeoutFlag(cmd, defaultPodLogsTimeout) | |
return cmd | |
} | |
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/describe.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/describe.go | |
index 3a0feafdd8..770f9f4641 100644 | |
--- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/describe.go | |
+++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/describe.go | |
@@ -114,7 +114,7 @@ func NewCmdDescribe(parent string, f cmdutil.Factory, streams genericclioptions. | |
usage := "containing the resource to describe" | |
cmdutil.AddFilenameOptionFlags(cmd, o.FilenameOptions, usage) | |
cmd.Flags().StringVarP(&o.Selector, "selector", "l", o.Selector, "Selector (label query) to filter on, supports '=', '==', and '!='.(e.g. -l key1=value1,key2=value2)") | |
- cmd.Flags().BoolVar(&o.AllNamespaces, "all-namespaces", o.AllNamespaces, "If present, list the requested object(s) across all namespaces. Namespace in current context is ignored even if specified with --namespace.") | |
+ cmd.Flags().BoolVarP(&o.AllNamespaces, "all-namespaces", "A", o.AllNamespaces, "If present, list the requested object(s) across all namespaces. Namespace in current context is ignored even if specified with --namespace.") | |
cmd.Flags().BoolVar(&o.DescriberSettings.ShowEvents, "show-events", o.DescriberSettings.ShowEvents, "If true, display events related to the described object.") | |
cmdutil.AddIncludeUninitializedFlag(cmd) | |
return cmd | |
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/get/get.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/get/get.go | |
index 02cd2bfe19..0aedb2f97e 100644 | |
--- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/get/get.go | |
+++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/get/get.go | |
@@ -170,7 +170,7 @@ func NewCmdGet(parent string, f cmdutil.Factory, streams genericclioptions.IOStr | |
cmd.Flags().BoolVar(&o.IgnoreNotFound, "ignore-not-found", o.IgnoreNotFound, "If the requested object does not exist the command will return exit code 0.") | |
cmd.Flags().StringVarP(&o.LabelSelector, "selector", "l", o.LabelSelector, "Selector (label query) to filter on, supports '=', '==', and '!='.(e.g. -l key1=value1,key2=value2)") | |
cmd.Flags().StringVar(&o.FieldSelector, "field-selector", o.FieldSelector, "Selector (field query) to filter on, supports '=', '==', and '!='.(e.g. --field-selector key1=value1,key2=value2). The server only supports a limited number of field queries per type.") | |
- cmd.Flags().BoolVar(&o.AllNamespaces, "all-namespaces", o.AllNamespaces, "If present, list the requested object(s) across all namespaces. Namespace in current context is ignored even if specified with --namespace.") | |
+ cmd.Flags().BoolVarP(&o.AllNamespaces, "all-namespaces", "A", o.AllNamespaces, "If present, list the requested object(s) across all namespaces. Namespace in current context is ignored even if specified with --namespace.") | |
cmdutil.AddIncludeUninitializedFlag(cmd) | |
addOpenAPIPrintColumnFlags(cmd, o) | |
addServerPrintColumnFlags(cmd, o) | |
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/top_pod.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/top_pod.go | |
index d627827b2c..3ed2749198 100644 | |
--- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/top_pod.go | |
+++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/top_pod.go | |
@@ -113,7 +113,7 @@ func NewCmdTopPod(f cmdutil.Factory, o *TopPodOptions, streams genericclioptions | |
} | |
cmd.Flags().StringVarP(&o.Selector, "selector", "l", o.Selector, "Selector (label query) to filter on, supports '=', '==', and '!='.(e.g. -l key1=value1,key2=value2)") | |
cmd.Flags().BoolVar(&o.PrintContainers, "containers", o.PrintContainers, "If present, print usage of containers within a pod.") | |
- cmd.Flags().BoolVar(&o.AllNamespaces, "all-namespaces", o.AllNamespaces, "If present, list the requested object(s) across all namespaces. Namespace in current context is ignored even if specified with --namespace.") | |
+ cmd.Flags().BoolVarP(&o.AllNamespaces, "all-namespaces", "A", o.AllNamespaces, "If present, list the requested object(s) across all namespaces. Namespace in current context is ignored even if specified with --namespace.") | |
o.HeapsterOptions.Bind(cmd.Flags()) | |
return cmd | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment