diff --git a/cmd/kubeadm/app/phases/kubelet/flags.go b/cmd/kubeadm/app/phases/kubelet/flags.go index 51277b81e73..e6e401380aa 100644 --- a/cmd/kubeadm/app/phases/kubelet/flags.go +++ b/cmd/kubeadm/app/phases/kubelet/flags.go @@ -70,8 +70,6 @@ func buildKubeletArgMap(opts kubeletFlagsOpts) map[string]string { if opts.nodeRegOpts.CRISocket == kubeadmapiv1alpha2.DefaultCRISocket { // These flags should only be set when running docker kubeletFlags["network-plugin"] = "cni" - kubeletFlags["cni-conf-dir"] = "/etc/cni/net.d" - kubeletFlags["cni-bin-dir"] = "/opt/cni/bin" driver, err := kubeadmutil.GetCgroupDriverDocker(opts.execer) if err != nil { glog.Warningf("cannot automatically assign a '--cgroup-driver' value when starting the Kubelet: %v\n", err) diff --git a/cmd/kubeadm/app/phases/kubelet/flags_test.go b/cmd/kubeadm/app/phases/kubelet/flags_test.go index b50a658df53..815090ce6c4 100644 --- a/cmd/kubeadm/app/phases/kubelet/flags_test.go +++ b/cmd/kubeadm/app/phases/kubelet/flags_test.go @@ -119,8 +119,6 @@ func TestBuildKubeletArgMap(t *testing.T) { }, expected: map[string]string{ "network-plugin": "cni", - "cni-conf-dir": "/etc/cni/net.d", - "cni-bin-dir": "/opt/cni/bin", }, }, { @@ -136,8 +134,6 @@ func TestBuildKubeletArgMap(t *testing.T) { }, expected: map[string]string{ "network-plugin": "cni", - "cni-conf-dir": "/etc/cni/net.d", - "cni-bin-dir": "/opt/cni/bin", "hostname-override": "override-name", }, }, @@ -154,8 +150,6 @@ func TestBuildKubeletArgMap(t *testing.T) { }, expected: map[string]string{ "network-plugin": "cni", - "cni-conf-dir": "/etc/cni/net.d", - "cni-bin-dir": "/opt/cni/bin", "cgroup-driver": "systemd", }, }, @@ -172,8 +166,6 @@ func TestBuildKubeletArgMap(t *testing.T) { }, expected: map[string]string{ "network-plugin": "cni", - "cni-conf-dir": "/etc/cni/net.d", - "cni-bin-dir": "/opt/cni/bin", "cgroup-driver": "cgroupfs", }, },