Merge pull request #66817 from charrywanganthony/version_c

Automatic merge from submit-queue (batch tested with PRs 61389, 66817, 66903, 66675, 66965). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. remove deprecated shorthand flag **Release note**: ```release-note remove deprecated shorthand flag `-c` from `kubectl version (--client)` ```

Merge pull request #66817 from charrywanganthony/version_c
43a46cc9 · Kubernetes Submit Queue · GitHub · b95ae931 · caa8d7ca · 43a46cc9
Unverified Commit 43a46cc9 authored Aug 03, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 03, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

version.go pkg/kubectl/cmd/version.go +2 -3

No files found.
--- a/pkg/kubectl/cmd/version.go
+++ b/pkg/kubectl/cmd/version.go
@@ -74,10 +74,9 @@ func NewCmdVersion(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *co
 			cmdutil.CheckErr(o.Run())
 		},
 	}
-	cmd.Flags().BoolVarP(&o.ClientOnly, "client", "c", o.ClientOnly, "Client version only (no server required).")
-	cmd.Flags().BoolVarP(&o.Short, "short", "", o.Short, "Print just the version number.")
+	cmd.Flags().BoolVar(&o.ClientOnly, "client", o.ClientOnly, "Client version only (no server required).")
+	cmd.Flags().BoolVar(&o.Short, "short", o.Short, "Print just the version number.")
 	cmd.Flags().StringVarP(&o.Output, "output", "o", o.Output, "One of 'yaml' or 'json'.")
-	cmd.Flags().MarkShorthandDeprecated("client", "please use --client instead.")
 	return cmd
 }