From 1cf00d1ff1962bae8283386ef5c4f2de4e79275f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?= Date: Wed, 26 Oct 2016 20:25:35 +0300 Subject: [PATCH] Remove the function of --reconcile-cidr and deprecate it --- cmd/kubelet/app/options/options.go | 3 ++- pkg/kubelet/kubelet.go | 5 ----- pkg/kubelet/kubelet_node_status.go | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index 4895aaf6bf7..8552dc3da93 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -224,7 +224,8 @@ func (s *KubeletServer) AddFlags(fs *pflag.FlagSet) { fs.Float64Var(&s.ChaosChance, "chaos-chance", s.ChaosChance, "If > 0.0, introduce random client errors and latency. Intended for testing. [default=0.0]") fs.BoolVar(&s.Containerized, "containerized", s.Containerized, "Experimental support for running kubelet in a container. Intended for testing. [default=false]") fs.Int64Var(&s.MaxOpenFiles, "max-open-files", s.MaxOpenFiles, "Number of files that can be opened by Kubelet process. [default=1000000]") - fs.BoolVar(&s.ReconcileCIDR, "reconcile-cidr", s.ReconcileCIDR, "Reconcile node CIDR with the CIDR specified by the API server. Won't have any effect if register-node is false. [default=true]") + fs.BoolVar(&s.ReconcileCIDR, "reconcile-cidr", s.ReconcileCIDR, "Reconcile node CIDR with the CIDR specified by the API server. This flag has no function anymore.") + fs.MarkDeprecated("reconcile-cidr", "The old --configure-cbr0 networking mode has been removed, so this flag has no function anymore. Will be removed in v1.6.") fs.Var(&s.SystemReserved, "system-reserved", "A set of ResourceName=ResourceQuantity (e.g. cpu=200m,memory=150G) pairs that describe resources reserved for non-kubernetes components. Currently only cpu and memory are supported. See http://kubernetes.io/docs/user-guide/compute-resources for more detail. [default=none]") fs.Var(&s.KubeReserved, "kube-reserved", "A set of ResourceName=ResourceQuantity (e.g. cpu=200m,memory=150G) pairs that describe resources reserved for kubernetes system components. Currently only cpu and memory are supported. See http://kubernetes.io/docs/user-guide/compute-resources for more detail. [default=none]") fs.BoolVar(&s.RegisterSchedulable, "register-schedulable", s.RegisterSchedulable, "Register the node as schedulable. Won't have any effect if register-node is false. [default=true]") diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 5246a55e0f8..f79c66939c9 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -426,7 +426,6 @@ func NewMainKubelet(kubeCfg *componentconfig.KubeletConfiguration, kubeDeps *Kub mounter: kubeDeps.Mounter, writer: kubeDeps.Writer, nonMasqueradeCIDR: kubeCfg.NonMasqueradeCIDR, - reconcileCIDR: kubeCfg.ReconcileCIDR, maxPods: int(kubeCfg.MaxPods), podsPerCore: int(kubeCfg.PodsPerCore), nvidiaGPUs: int(kubeCfg.NvidiaGPUs), @@ -951,10 +950,6 @@ type Kubelet struct { containerManager cm.ContainerManager nodeConfig cm.NodeConfig - // Whether or not kubelet should take responsibility for keeping cbr0 in - // the correct state. - reconcileCIDR bool - // Traffic to IPs outside this range will use IP masquerade. nonMasqueradeCIDR string diff --git a/pkg/kubelet/kubelet_node_status.go b/pkg/kubelet/kubelet_node_status.go index 3635bc6a04e..ee16cbeb6b4 100644 --- a/pkg/kubelet/kubelet_node_status.go +++ b/pkg/kubelet/kubelet_node_status.go @@ -333,9 +333,7 @@ func (kl *Kubelet) tryUpdateNodeStatus() error { } node := &nodes.Items[0] - if kl.reconcileCIDR { - kl.updatePodCIDR(node.Spec.PodCIDR) - } + kl.updatePodCIDR(node.Spec.PodCIDR) if err := kl.setNodeStatus(node); err != nil { return err