From 7f30b3494bf952ca39dca72d2f6a05ecde83da2a Mon Sep 17 00:00:00 2001
From: SataQiu <shidaqiu2018@gmail.com>
Date: Tue, 28 May 2024 23:56:55 +0800
Subject: [PATCH] kubeadm: only add the klog flags that are still supported for
 kubeadm, rather than disabling the unwanted flags

---
 cmd/kubeadm/app/kubeadm.go | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/cmd/kubeadm/app/kubeadm.go b/cmd/kubeadm/app/kubeadm.go
index 1ba4cc2fd23..c4e421ec22f 100644
--- a/cmd/kubeadm/app/kubeadm.go
+++ b/cmd/kubeadm/app/kubeadm.go
@@ -30,24 +30,19 @@ import (
 
 // Run creates and executes new kubeadm command
 func Run() error {
-	klog.InitFlags(nil)
+	var allFlags flag.FlagSet
+	klog.InitFlags(&allFlags)
+	// only add the flags that are still supported for kubeadm
+	allFlags.VisitAll(func(f *flag.Flag) {
+		switch f.Name {
+		case "v", "add_dir_header", "skip_headers":
+			flag.CommandLine.Var(f.Value, f.Name, f.Usage)
+		}
+	})
+
 	pflag.CommandLine.SetNormalizeFunc(cliflag.WordSepNormalizeFunc)
 	pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
 
-	pflag.Set("logtostderr", "true")
-	// We do not want these flags to show up in --help
-	// These MarkHidden calls must be after the lines above
-	pflag.CommandLine.MarkHidden("alsologtostderr")
-	pflag.CommandLine.MarkHidden("log-backtrace-at")
-	pflag.CommandLine.MarkHidden("log-dir")
-	pflag.CommandLine.MarkHidden("logtostderr")
-	pflag.CommandLine.MarkHidden("log-file")          //nolint:errcheck
-	pflag.CommandLine.MarkHidden("log-file-max-size") //nolint:errcheck
-	pflag.CommandLine.MarkHidden("one-output")        //nolint:errcheck
-	pflag.CommandLine.MarkHidden("skip-log-headers")  //nolint:errcheck
-	pflag.CommandLine.MarkHidden("stderrthreshold")
-	pflag.CommandLine.MarkHidden("vmodule")
-
 	cmd := cmd.NewKubeadmCommand(os.Stdin, os.Stdout, os.Stderr)
 	return cmd.Execute()
 }