Merge pull request kubernetes#3688 from justinsb/rename_kubenet_cni_dir

Automatic merge from submit-queue. Rename flag from network-plugin-dir -> cni-bin-dir
bobbarjung · Oct 23, 2017 · 0463ae1 · 0463ae1
2 parents 1e9cfbd + 7c695e7
commit 0463ae1
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/nodeup/pkg/model/kubelet.go b/nodeup/pkg/model/kubelet.go
@@ -149,8 +149,13 @@ func (b *KubeletBuilder) buildSystemdEnvironmentFile(kubeletConfig *kops.Kubelet
 	}
 
 	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()
+		// Kubenet is neither CNI nor not-CNI, so we need to pass it `--cni-bin-dir` also
+		if b.IsKubernetesGTE("1.9") {
+			// Flag renamed in #53564
+			flags += " --cni-bin-dir=" + b.CNIBinDir()
+		} else {
+			flags += " --network-plugin-dir=" + b.CNIBinDir()
+		}
 	}
 
 	if b.usesContainerizedMounter() {