github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 07:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13179 from feihujiang/showClientVersionAtLeastWhenCouldNotReadServerVersion

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-08-28 17:32:57 -07:00
commit 4c56d4962f
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubectl/cmd/version.go
View File

@ -39,8 +39,8 @@ func NewCmdVersion(f *cmdutil.Factory, out io.Writer) *cobra.Command {
}
func RunVersion(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command) error {
kubectl.GetClientVersion(out)
if cmdutil.GetFlagBool(cmd, "client") {
kubectl.GetClientVersion(out)
return nil
}
@ -49,6 +49,6 @@ func RunVersion(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command) error {
return err
}
kubectl.GetVersion(out, client)
kubectl.GetServerVersion(out, client)
return nil
}

6
pkg/kubectl/version.go
View File

@ -25,12 +25,10 @@ import (
"k8s.io/kubernetes/pkg/version"
)
func GetVersion(w io.Writer, kubeClient client.Interface) {
GetClientVersion(w)
func GetServerVersion(w io.Writer, kubeClient client.Interface) {
serverVersion, err := kubeClient.ServerVersion()
if err != nil {
fmt.Printf("Couldn't read version from server: %v\n", err)
fmt.Printf("Couldn't read server version from server: %v\n", err)
os.Exit(1)
}