From 2edb3349933868124f0f1346e92db0b6b3e0e06b Mon Sep 17 00:00:00 2001 From: SataQiu Date: Tue, 19 Dec 2023 16:32:30 +0800 Subject: [PATCH 1/2] kubeadm: hide unwanted global klog flags --- cmd/kubeadm/app/kubeadm.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/kubeadm/app/kubeadm.go b/cmd/kubeadm/app/kubeadm.go index b67c63251b5..e25532c0841 100644 --- a/cmd/kubeadm/app/kubeadm.go +++ b/cmd/kubeadm/app/kubeadm.go @@ -37,12 +37,14 @@ func Run() error { 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("version") - pflag.CommandLine.MarkHidden("log-flush-frequency") pflag.CommandLine.MarkHidden("alsologtostderr") pflag.CommandLine.MarkHidden("log-backtrace-at") pflag.CommandLine.MarkHidden("log-dir") pflag.CommandLine.MarkHidden("logtostderr") + pflag.CommandLine.MarkHidden("log-file") + pflag.CommandLine.MarkHidden("log-file-max-size") + pflag.CommandLine.MarkHidden("one-output") + pflag.CommandLine.MarkHidden("skip-log-headers") pflag.CommandLine.MarkHidden("stderrthreshold") pflag.CommandLine.MarkHidden("vmodule") From 64da4345231300d5cc85f35609cd88307a588e59 Mon Sep 17 00:00:00 2001 From: SataQiu Date: Tue, 19 Dec 2023 18:15:00 +0800 Subject: [PATCH 2/2] kubeadm: hide unwanted global klog flags --- cmd/kubeadm/app/kubeadm.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/kubeadm/app/kubeadm.go b/cmd/kubeadm/app/kubeadm.go index e25532c0841..1ba4cc2fd23 100644 --- a/cmd/kubeadm/app/kubeadm.go +++ b/cmd/kubeadm/app/kubeadm.go @@ -41,10 +41,10 @@ func Run() error { pflag.CommandLine.MarkHidden("log-backtrace-at") pflag.CommandLine.MarkHidden("log-dir") pflag.CommandLine.MarkHidden("logtostderr") - pflag.CommandLine.MarkHidden("log-file") - pflag.CommandLine.MarkHidden("log-file-max-size") - pflag.CommandLine.MarkHidden("one-output") - pflag.CommandLine.MarkHidden("skip-log-headers") + 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")