github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: remove redundant flags settings for kubelet

Browse Source
This commit is contained in:
Di Xu 2018-06-04 15:18:54 +08:00
parent e49e3baa83
commit b3242c4be6
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/phases/kubelet/flags.go
View File

@ -70,8 +70,6 @@ func buildKubeletArgMap(opts kubeletFlagsOpts) map[string]string {
if opts.nodeRegOpts.CRISocket == kubeadmapiv1alpha2.DefaultCRISocket { if opts.nodeRegOpts.CRISocket == kubeadmapiv1alpha2.DefaultCRISocket {
// These flags should only be set when running docker // These flags should only be set when running docker
kubeletFlags["network-plugin"] = "cni" 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) driver, err := kubeadmutil.GetCgroupDriverDocker(opts.execer)
if err != nil { if err != nil {
glog.Warningf("cannot automatically assign a '--cgroup-driver' value when starting the Kubelet: %v\n", err) glog.Warningf("cannot automatically assign a '--cgroup-driver' value when starting the Kubelet: %v\n", err)

8
cmd/kubeadm/app/phases/kubelet/flags_test.go
View File

@ -119,8 +119,6 @@ func TestBuildKubeletArgMap(t *testing.T) {
}, },
expected: map[string]string{ expected: map[string]string{
"network-plugin": "cni", "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{ expected: map[string]string{
"network-plugin": "cni", "network-plugin": "cni",
"cni-conf-dir": "/etc/cni/net.d",
"cni-bin-dir": "/opt/cni/bin",
"hostname-override": "override-name", "hostname-override": "override-name",
}, },
}, },
@ -154,8 +150,6 @@ func TestBuildKubeletArgMap(t *testing.T) {
}, },
expected: map[string]string{ expected: map[string]string{
"network-plugin": "cni", "network-plugin": "cni",
"cni-conf-dir": "/etc/cni/net.d",
"cni-bin-dir": "/opt/cni/bin",
"cgroup-driver": "systemd", "cgroup-driver": "systemd",
}, },
}, },
@ -172,8 +166,6 @@ func TestBuildKubeletArgMap(t *testing.T) {
}, },
expected: map[string]string{ expected: map[string]string{
"network-plugin": "cni", "network-plugin": "cni",
"cni-conf-dir": "/etc/cni/net.d",
"cni-bin-dir": "/opt/cni/bin",
"cgroup-driver": "cgroupfs", "cgroup-driver": "cgroupfs",
}, },
}, },