mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-15 23:03:40 +00:00
Hide deprecated warnings
This commit is contained in:
parent
8ef82833b1
commit
ff40fc9c69
@ -335,30 +335,6 @@ func (f *KubeletFlags) AddFlags(mainfs *pflag.FlagSet) {
|
|||||||
func AddKubeletConfigFlags(mainfs *pflag.FlagSet, c *kubeletconfig.KubeletConfiguration) {
|
func AddKubeletConfigFlags(mainfs *pflag.FlagSet, c *kubeletconfig.KubeletConfiguration) {
|
||||||
fs := pflag.NewFlagSet("", pflag.ExitOnError)
|
fs := pflag.NewFlagSet("", pflag.ExitOnError)
|
||||||
defer func() {
|
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)
|
mainfs.AddFlagSet(fs)
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
@ -74,8 +74,6 @@ func (s *DeprecatedInsecureServingOptions) AddFlags(fs *pflag.FlagSet) {
|
|||||||
|
|
||||||
fs.IntVar(&s.BindPort, "insecure-port", s.BindPort, ""+
|
fs.IntVar(&s.BindPort, "insecure-port", s.BindPort, ""+
|
||||||
"The port on which to serve unsecured, unauthenticated access.")
|
"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
|
fs.Lookup("insecure-port").Hidden = false
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -91,7 +89,6 @@ func (s *DeprecatedInsecureServingOptions) AddUnqualifiedFlags(fs *pflag.FlagSet
|
|||||||
fs.Lookup("address").Hidden = false
|
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.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
|
fs.Lookup("port").Hidden = false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user