[release-1.28] Remove duplicate pflag.Parse calls (#2467)

* client-keystone-auth: Remove duplicate pflag.Parse call

This is already handled by the earlier call to the (confusingly named)
'InitFlags' function provided by 'k8s.io/component-base/cli/flag' [1].

[1] https://github.com/kubernetes/component-base/blob/v0.28.1/cli/flag/flags.go#L51-L59

Signed-off-by: Stephen Finucane <[email protected]>
(cherry picked from commit d0fc449)

* k8s-keystone-auth: Remove duplicate pflag.Parse call

This is already handled by the earlier call to the (confusingly named)
'InitFlags' function provided by 'k8s.io/component-base/cli/flag' [1].
We need to move the handling for the '--version' flag to after this to
ensure we parse the flags first.

[1] https://github.com/kubernetes/component-base/blob/v0.28.1/cli/flag/flags.go#L51-L59

Signed-off-by: Stephen Finucane <[email protected]>
(cherry picked from commit de63646)

cmd/client-keystone-auth/main.go

@@ -187,9 +187,8 @@ func main() {
 	logs.AddFlags(pflag.CommandLine)
 
 	pflag.CommandLine.AddGoFlagSet(klogFlags)
-	kflag.InitFlags()
 
-	pflag.Parse()
+	kflag.InitFlags()
 
 	if showVersion {
 		fmt.Println(version.Version)

cmd/k8s-keystone-auth/main.go

@@ -55,20 +55,19 @@ func main() {
 		}
 	})
 
-	pflag.Parse()
-
-	if showVersion {
-		fmt.Println(version.Version)
-		os.Exit(0)
-	}
-
 	logs.InitLogs()
 	defer logs.FlushLogs()
 
 	config := keystone.NewConfig()
 	config.AddFlags(pflag.CommandLine)
+
 	kflag.InitFlags()
 
+	if showVersion {
+		fmt.Println(version.Version)
+		os.Exit(0)
+	}
+
 	if err := config.ValidateFlags(); err != nil {
 		klog.Errorf("%v", err)
 		os.Exit(1)