kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #108987 from soltysh/deprecate_long_version 

Start deprecating long/golang version information

Kubernetes-commit: 5a651eacbc7176c5922ec9c9137d00fbbbc2b683
This commit is contained in:
Kubernetes Publisher 2022-03-25 15:35:17 -07:00
parent 504e5f363e d2031a1eed
commit 77a7b65409
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
go.mod
View File

@ -32,9 +32,9 @@ require (
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 golang.org/x/sys v0.0.0-20220209214540-3681064d5158
gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20220324210930-df53a95c65aa k8s.io/api v0.0.0-20220324210930-df53a95c65aa
k8s.io/apimachinery v0.0.0-20220324210734-b68ae5efb0e8 k8s.io/apimachinery v0.0.0-20220326010739-df7fbf8e030b
k8s.io/cli-runtime v0.0.0-20220325092719-22908c6d8e63 k8s.io/cli-runtime v0.0.0-20220325092719-22908c6d8e63
k8s.io/client-go v0.0.0-20220325051238-b307538aa1ea k8s.io/client-go v0.0.0-20220326011238-23ab4aec8e31
k8s.io/component-base v0.0.0-20220325173314-62299fee2b4b k8s.io/component-base v0.0.0-20220325173314-62299fee2b4b
k8s.io/component-helpers v0.0.0-20220324211837-3d0aa6c934c2 k8s.io/component-helpers v0.0.0-20220324211837-3d0aa6c934c2
k8s.io/klog/v2 v2.60.1 k8s.io/klog/v2 v2.60.1
@ -49,9 +49,9 @@ require (
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20220324210930-df53a95c65aa k8s.io/api => k8s.io/api v0.0.0-20220324210930-df53a95c65aa
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220324210734-b68ae5efb0e8 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220326010739-df7fbf8e030b
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220325092719-22908c6d8e63 k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220325092719-22908c6d8e63
k8s.io/client-go => k8s.io/client-go v0.0.0-20220325051238-b307538aa1ea k8s.io/client-go => k8s.io/client-go v0.0.0-20220326011238-23ab4aec8e31
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220324210542-671bd3e7b101 k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220324210542-671bd3e7b101
k8s.io/component-base => k8s.io/component-base v0.0.0-20220325173314-62299fee2b4b k8s.io/component-base => k8s.io/component-base v0.0.0-20220325173314-62299fee2b4b
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220324211837-3d0aa6c934c2 k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220324211837-3d0aa6c934c2

8
go.sum
View File

@ -853,12 +853,12 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20220324210930-df53a95c65aa h1:NzCktMsy22Y/ddoBN/kf96kFaklITIHNfA1sRv6UofA= k8s.io/api v0.0.0-20220324210930-df53a95c65aa h1:NzCktMsy22Y/ddoBN/kf96kFaklITIHNfA1sRv6UofA=
k8s.io/api v0.0.0-20220324210930-df53a95c65aa/go.mod h1:Ea6ReZGsqdWOZc66t7sHO58lTcUGyQcMJ3UfsqOnKfM= k8s.io/api v0.0.0-20220324210930-df53a95c65aa/go.mod h1:Ea6ReZGsqdWOZc66t7sHO58lTcUGyQcMJ3UfsqOnKfM=
k8s.io/apimachinery v0.0.0-20220324210734-b68ae5efb0e8 h1:LULUz36bFy2WqAjJVZAbn4yVJ92Xn7oBaUCF6BR8HDk= k8s.io/apimachinery v0.0.0-20220326010739-df7fbf8e030b h1:KdYn+MuhEqOjmABS52f4cQuWkxJ8DDkAgw6BkHfjD+0=
k8s.io/apimachinery v0.0.0-20220324210734-b68ae5efb0e8/go.mod h1:V4ECjDypP1xQpnL3N9yFzlbGZgd8tLKouJnRyAn/Zyw= k8s.io/apimachinery v0.0.0-20220326010739-df7fbf8e030b/go.mod h1:V4ECjDypP1xQpnL3N9yFzlbGZgd8tLKouJnRyAn/Zyw=
k8s.io/cli-runtime v0.0.0-20220325092719-22908c6d8e63 h1:v7ST7uy7yUrS8TwZST8IWbycELYqOO7S8LYKq4YOsZk= k8s.io/cli-runtime v0.0.0-20220325092719-22908c6d8e63 h1:v7ST7uy7yUrS8TwZST8IWbycELYqOO7S8LYKq4YOsZk=
k8s.io/cli-runtime v0.0.0-20220325092719-22908c6d8e63/go.mod h1:3Dn+P07RFSmPv4hCjVFsoFZLQc8weg9MU2jUk/miGk8= k8s.io/cli-runtime v0.0.0-20220325092719-22908c6d8e63/go.mod h1:3Dn+P07RFSmPv4hCjVFsoFZLQc8weg9MU2jUk/miGk8=
k8s.io/client-go v0.0.0-20220325051238-b307538aa1ea h1:IFIO50j5PMsxUlqHCIf269GbWHAC0mtX/xo+KjEdW6A= k8s.io/client-go v0.0.0-20220326011238-23ab4aec8e31 h1:cK8N5IdGpsDgpHQA4LT/urERHjULfJ7r6pzi4Y77cLw=
k8s.io/client-go v0.0.0-20220325051238-b307538aa1ea/go.mod h1:sVLZTMIBHUCD7MFbyyUPejZNIlOLYZ2aZcZuP0z1aI0= k8s.io/client-go v0.0.0-20220326011238-23ab4aec8e31/go.mod h1:Ybgn93C4EQdX8j0DOUUxpqR2Y1meaOQLr7Uj4rz/4CU=
k8s.io/code-generator v0.0.0-20220324210542-671bd3e7b101/go.mod h1:PF9AME2o5S390iHxUI2/febDrY7GRb+AECnBzIWxIO0= k8s.io/code-generator v0.0.0-20220324210542-671bd3e7b101/go.mod h1:PF9AME2o5S390iHxUI2/febDrY7GRb+AECnBzIWxIO0=
k8s.io/component-base v0.0.0-20220325173314-62299fee2b4b h1:xr/aKY5vuY7KU2PtM7hLDjfXXZ86QDssCPZVcE8Q+dw= k8s.io/component-base v0.0.0-20220325173314-62299fee2b4b h1:xr/aKY5vuY7KU2PtM7hLDjfXXZ86QDssCPZVcE8Q+dw=
k8s.io/component-base v0.0.0-20220325173314-62299fee2b4b/go.mod h1:sR9Yr2nlylEJwTXJ9JiCr6u/QoZi+4SpVsEPST/jf1E= k8s.io/component-base v0.0.0-20220325173314-62299fee2b4b/go.mod h1:sR9Yr2nlylEJwTXJ9JiCr6u/QoZi+4SpVsEPST/jf1E=

2
pkg/cmd/version/version.go
View File

@ -86,6 +86,7 @@ func NewCmdVersion(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *co
} }
cmd.Flags().BoolVar(&o.ClientOnly, "client", o.ClientOnly, "If true, shows client version only (no server required).") cmd.Flags().BoolVar(&o.ClientOnly, "client", o.ClientOnly, "If true, shows client version only (no server required).")
cmd.Flags().BoolVar(&o.Short, "short", o.Short, "If true, print just the version number.") cmd.Flags().BoolVar(&o.Short, "short", o.Short, "If true, print just the version number.")
cmd.Flags().MarkDeprecated("short", "and will be removed in the future. The --short output will become the default.")
cmd.Flags().StringVarP(&o.Output, "output", "o", o.Output, "One of 'yaml' or 'json'.") cmd.Flags().StringVarP(&o.Output, "output", "o", o.Output, "One of 'yaml' or 'json'.")
return cmd return cmd
} }
@ -143,6 +144,7 @@ func (o *Options) Run() error {
fmt.Fprintf(o.Out, "Server Version: %s\n", versionInfo.ServerVersion.GitVersion) fmt.Fprintf(o.Out, "Server Version: %s\n", versionInfo.ServerVersion.GitVersion)
} }
} else { } else {
fmt.Fprintf(o.ErrOut, "WARNING: This version information is deprecated and will be replaced with the output from kubectl version --short. Use --output=yaml|json to get the full version.\n")
fmt.Fprintf(o.Out, "Client Version: %#v\n", *versionInfo.ClientVersion) fmt.Fprintf(o.Out, "Client Version: %#v\n", *versionInfo.ClientVersion)
fmt.Fprintf(o.Out, "Kustomize Version: %s\n", versionInfo.KustomizeVersion) fmt.Fprintf(o.Out, "Kustomize Version: %s\n", versionInfo.KustomizeVersion)
if versionInfo.ServerVersion != nil { if versionInfo.ServerVersion != nil {