Merge pull request kubernetes#90139 from scality/GH90138-program-name-in-verflag-output

k8s-ci-robot · web-flow · commit 429aefa2e6e1 · 2020-04-29T14:36:20.000-07:00
version/verflag: make program name variable
diff --git a/staging/src/k8s.io/component-base/version/verflag/verflag.go b/staging/src/k8s.io/component-base/version/verflag/verflag.go
@@ -89,6 +89,7 @@ const versionFlagName = "version"
 
 var (
 	versionFlag = Version(versionFlagName, VersionFalse, "Print version information and quit")
+	programName = "Kubernetes"
 )
 
 // AddFlags registers this package's flags on arbitrary FlagSets, such that they point to the
@@ -104,7 +105,7 @@ func PrintAndExitIfRequested() {
 		fmt.Printf("%#v\n", version.Get())
 		os.Exit(0)
 	} else if *versionFlag == VersionTrue {
-		fmt.Printf("Kubernetes %s\n", version.Get())
+		fmt.Printf("%s %s\n", programName, version.Get())
 		os.Exit(0)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@ const versionFlagName = "version"`
`89`	`89`
`90`	`90`	`var (`
`91`	`91`	`versionFlag = Version(versionFlagName, VersionFalse, "Print version information and quit")`
	`92`	`+ programName = "Kubernetes"`
`92`	`93`	`)`
`93`	`94`
`94`	`95`	`// AddFlags registers this package's flags on arbitrary FlagSets, such that they point to the`
`@@ -104,7 +105,7 @@ func PrintAndExitIfRequested() {`
`104`	`105`	`fmt.Printf("%#v\n", version.Get())`
`105`	`106`	`os.Exit(0)`
`106`	`107`	`} else if *versionFlag == VersionTrue {`
`107`		`- fmt.Printf("Kubernetes %s\n", version.Get())`
	`108`	`+ fmt.Printf("%s %s\n", programName, version.Get())`
`108`	`109`	`os.Exit(0)`
`109`	`110`	`}`
`110`	`111`	`}`