From 1909b8809730a564c508ffd54702c17aad63815a Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Sun, 9 Apr 2017 01:18:04 -0400 Subject: [PATCH] Pass --network-plugin-dir for kubenet kubenet continues to look there rather than --cni-bin-dir --- nodeup/pkg/model/kubelet.go | 5 +++++ nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/nodeup/pkg/model/kubelet.go b/nodeup/pkg/model/kubelet.go index 2f1e897029..1ecc3f35e7 100644 --- a/nodeup/pkg/model/kubelet.go +++ b/nodeup/pkg/model/kubelet.go @@ -140,6 +140,11 @@ func (b *KubeletBuilder) buildSystemdEnvironmentFile(kubeletConfig *kops.Kubelet flags += " --cni-conf-dir=" + b.CNIConfDir() } + if b.Cluster.Spec.Networking != nil && b.Cluster.Spec.Networking.Kubenet != nil { + // Kubenet is neither CNI nor not-CNI, so we need to pass it `--network-plugin-dir` also + flags += " --network-plugin-dir=" + b.CNIBinDir() + } + sysconfig := "DAEMON_ARGS=\"" + flags + "\"\n" t := &nodetasks.File{ diff --git a/nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml b/nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml index 23cbc4fb61..585a3aae16 100644 --- a/nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml +++ b/nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml @@ -1,4 +1,4 @@ contents: | - DAEMON_ARGS="--feature-gates=AllowExtTrafficLocalEndpoints=false,ExperimentalCriticalPodAnnotation=true --node-labels=kubernetes.io/role=node,node-role.kubernetes.io/node= --cni-bin-dir=/opt/cni/bin/ --cni-conf-dir=/etc/cni/net.d/" + DAEMON_ARGS="--feature-gates=AllowExtTrafficLocalEndpoints=false,ExperimentalCriticalPodAnnotation=true --node-labels=kubernetes.io/role=node,node-role.kubernetes.io/node= --cni-bin-dir=/opt/cni/bin/ --cni-conf-dir=/etc/cni/net.d/ --network-plugin-dir=/opt/cni/bin/" path: /etc/sysconfig/kubelet type: file