github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1245 from filbranden/server_version1

Browse Source 
Uniformize handling of -server_version flag of kubecfg to match -version
This commit is contained in:
Joe Beda
2014-09-09 15:47:33 -07:00
parent ffcfdd0e2d b849d65b32
commit 0333b97c56
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/kubecfg/kubecfg.go
View File

@@ -39,7 +39,7 @@ import (
) )
var ( var (
serverVersion = flag.Bool("server_version", false, "Print the server's version number.") serverVersion = verflag.Version("server_version", verflag.VersionFalse, "Print the server's version information and quit")
preventSkew = flag.Bool("expect_version_match", false, "Fail if server's version doesn't match own version.") preventSkew = flag.Bool("expect_version_match", false, "Fail if server's version doesn't match own version.")
httpServer = flag.String("h", "", "The host to connect to.") httpServer = flag.String("h", "", "The host to connect to.")
config = flag.String("c", "", "Path to the config file.") config = flag.String("c", "", "Path to the config file.")
@@ -152,14 +152,19 @@ func main() {
} }
} }
if *serverVersion { if *serverVersion != verflag.VersionFalse {
got, err := kubeClient.ServerVersion() got, err := kubeClient.ServerVersion()
if err != nil { if err != nil {
fmt.Printf("Couldn't read version from server: %v\n", err) fmt.Printf("Couldn't read version from server: %v\n", err)
os.Exit(1) os.Exit(1)
} }
fmt.Printf("Server Version: %#v\n", got) if *serverVersion == verflag.VersionRaw {
os.Exit(0) fmt.Printf("%#v\n", *got)
os.Exit(0)
} else {
fmt.Printf("Server: Kubernetes %s\n", got)
os.Exit(0)
}
} }
if *preventSkew { if *preventSkew {