Unverified Commit 0ba00ec3 authored by k8s-ci-robot's avatar k8s-ci-robot Committed by GitHub

Merge pull request #69209 from Pingan2017/control-config

remove flag: insecure-experimental-approve-all-kubelet-csrs-for-group
parents af693a28 3bf4a975
...@@ -260,9 +260,6 @@ func (s *KubeControllerManagerOptions) Flags(allControllers []string, disabledBy ...@@ -260,9 +260,6 @@ func (s *KubeControllerManagerOptions) Flags(allControllers []string, disabledBy
fs := fss.FlagSet("misc") fs := fss.FlagSet("misc")
fs.StringVar(&s.Master, "master", s.Master, "The address of the Kubernetes API server (overrides any value in kubeconfig).") fs.StringVar(&s.Master, "master", s.Master, "The address of the Kubernetes API server (overrides any value in kubeconfig).")
fs.StringVar(&s.Kubeconfig, "kubeconfig", s.Kubeconfig, "Path to kubeconfig file with authorization and master location information.") fs.StringVar(&s.Kubeconfig, "kubeconfig", s.Kubeconfig, "Path to kubeconfig file with authorization and master location information.")
var dummy string
fs.MarkDeprecated("insecure-experimental-approve-all-kubelet-csrs-for-group", "This flag does nothing.")
fs.StringVar(&dummy, "insecure-experimental-approve-all-kubelet-csrs-for-group", "", "This flag does nothing.")
utilfeature.DefaultFeatureGate.AddFlag(fss.FlagSet("generic")) utilfeature.DefaultFeatureGate.AddFlag(fss.FlagSet("generic"))
return fss return fss
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment