Commit 2320fde4 authored by Daniel Nardo's avatar Daniel Nardo

Update kubelet to use the network-plugin-dir if the cni-bin-dir flag

is not set.
parent d1f4664f
...@@ -106,9 +106,14 @@ func ProbeNetworkPlugins(pluginDir, cniConfDir, cniBinDir string) []network.Netw ...@@ -106,9 +106,14 @@ func ProbeNetworkPlugins(pluginDir, cniConfDir, cniBinDir string) []network.Netw
if cniConfDir == "" { if cniConfDir == "" {
cniConfDir = pluginDir cniConfDir = pluginDir
} }
binDir := cniBinDir
if binDir == "" {
binDir = pluginDir
}
// for each existing plugin, add to the list // for each existing plugin, add to the list
allPlugins = append(allPlugins, cni.ProbeNetworkPlugins(cniConfDir, cniBinDir)...) allPlugins = append(allPlugins, cni.ProbeNetworkPlugins(cniConfDir, binDir)...)
allPlugins = append(allPlugins, kubenet.NewPlugin(pluginDir)) allPlugins = append(allPlugins, kubenet.NewPlugin(binDir))
return allPlugins return allPlugins
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment