github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 12:32:03 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
is not set.
This commit is contained in:
Daniel Nardo 2017-04-19 16:22:19 -07:00
parent d1f4664f5b
commit 2320fde49c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/kubelet/app/plugins.go
View File

@ -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
} }