From 2320fde49c8254bb9a36b12443bcb80dda2861c9 Mon Sep 17 00:00:00 2001
From: Daniel Nardo <dnardo@google.com>
Date: Wed, 19 Apr 2017 16:22:19 -0700
Subject: [PATCH] Update kubelet to use the network-plugin-dir if the
 cni-bin-dir flag is not set.

---
 cmd/kubelet/app/plugins.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/cmd/kubelet/app/plugins.go b/cmd/kubelet/app/plugins.go
index e500bb786c..10be1927d7 100644
--- a/cmd/kubelet/app/plugins.go
+++ b/cmd/kubelet/app/plugins.go
@@ -106,9 +106,14 @@ func ProbeNetworkPlugins(pluginDir, cniConfDir, cniBinDir string) []network.Netw
 	if cniConfDir == "" {
 		cniConfDir = pluginDir
 	}
+
+	binDir := cniBinDir
+	if binDir == "" {
+		binDir = pluginDir
+	}
 	// for each existing plugin, add to the list
-	allPlugins = append(allPlugins, cni.ProbeNetworkPlugins(cniConfDir, cniBinDir)...)
-	allPlugins = append(allPlugins, kubenet.NewPlugin(pluginDir))
+	allPlugins = append(allPlugins, cni.ProbeNetworkPlugins(cniConfDir, binDir)...)
+	allPlugins = append(allPlugins, kubenet.NewPlugin(binDir))
 
 	return allPlugins
 }