From 8d467a29386a957cadfb24c30666971583dcb683 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Mon, 23 Oct 2017 00:53:25 -0400
Subject: [PATCH] Rename flag from network-plugin-dir -> cni-bin-dir

Per https://github.com/kubernetes/kubernetes/pull/53564/files
---
 nodeup/pkg/model/kubelet.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/nodeup/pkg/model/kubelet.go b/nodeup/pkg/model/kubelet.go
index 088a76894ffd0..09fdb1a2cf96e 100644
--- 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() {