From ff40fc9c6944b098784ec7536df60a0d4a8fde68 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Thu, 7 Feb 2019 20:52:50 -0700 Subject: [PATCH] Hide deprecated warnings --- cmd/kubelet/app/options/options.go | 24 ------------------- .../options/deprecated_insecure_serving.go | 3 --- 2 files changed, 27 deletions(-) diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index 7e87dc944bc..18472a7cd96 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -335,30 +335,6 @@ func (f *KubeletFlags) AddFlags(mainfs *pflag.FlagSet) { func AddKubeletConfigFlags(mainfs *pflag.FlagSet, c *kubeletconfig.KubeletConfiguration) { fs := pflag.NewFlagSet("", pflag.ExitOnError) defer func() { - // All KubeletConfiguration flags are now deprecated, and any new flags that point to - // KubeletConfiguration fields are deprecated-on-creation. When removing flags at the end - // of their deprecation period, be careful to check that they have *actually* been deprecated - // members of the KubeletConfiguration for the entire deprecation period: - // e.g. if a flag was added after this deprecation function, it may not be at the end - // of its lifetime yet, even if the rest are. - deprecated := "This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information." - // Some flags are permanently (?) meant to be available. In - // Kubernetes 1.23, the following options were added to - // LoggingConfiguration (long-term goal, more complete - // configuration file) but deprecating the flags seemed - // premature. - notDeprecated := map[string]bool{ - "v": true, - "vmodule": true, - "log-flush-frequency": true, - "provider-id": true, - } - fs.VisitAll(func(f *pflag.Flag) { - if notDeprecated[f.Name] { - return - } - f.Deprecated = deprecated - }) mainfs.AddFlagSet(fs) }() diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/deprecated_insecure_serving.go b/staging/src/k8s.io/apiserver/pkg/server/options/deprecated_insecure_serving.go index dd05bfecdb5..7393aef8540 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/deprecated_insecure_serving.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/deprecated_insecure_serving.go @@ -74,8 +74,6 @@ func (s *DeprecatedInsecureServingOptions) AddFlags(fs *pflag.FlagSet) { fs.IntVar(&s.BindPort, "insecure-port", s.BindPort, ""+ "The port on which to serve unsecured, unauthenticated access.") - // Though this flag is deprecated, we discovered security concerns over how to do health checks without it e.g. #43784 - fs.MarkDeprecated("insecure-port", "This flag will be removed in a future version.") fs.Lookup("insecure-port").Hidden = false } @@ -91,7 +89,6 @@ func (s *DeprecatedInsecureServingOptions) AddUnqualifiedFlags(fs *pflag.FlagSet fs.Lookup("address").Hidden = false fs.IntVar(&s.BindPort, "port", s.BindPort, "The port on which to serve unsecured, unauthenticated access. Set to 0 to disable.") - fs.MarkDeprecated("port", "see --secure-port instead.") fs.Lookup("port").Hidden = false }