github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kubelet: remove the --network-plugin-dir flag

Browse Source
This commit is contained in:
supereagle
2017-10-08 10:14:11 +08:00
parent d97c759110
commit 0b88971505
6 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,21 +107,12 @@ func GetDynamicPluginProber(pluginDir string) volume.DynamicPluginProber {
}
// ProbeNetworkPlugins collects all compiled-in plugins
func ProbeNetworkPlugins(pluginDir, cniConfDir, cniBinDir string) []network.NetworkPlugin {
func ProbeNetworkPlugins(cniConfDir, cniBinDir string) []network.NetworkPlugin {
allPlugins := []network.NetworkPlugin{}
// for backwards-compat, allow pluginDir as a source of CNI config files
if cniConfDir == "" {
cniConfDir = pluginDir
}
binDir := cniBinDir
if binDir == "" {
binDir = pluginDir
}
// for each existing plugin, add to the list
allPlugins = append(allPlugins, cni.ProbeNetworkPlugins(cniConfDir, binDir)...)
allPlugins = append(allPlugins, kubenet.NewPlugin(binDir))
allPlugins = append(allPlugins, cni.ProbeNetworkPlugins(cniConfDir, cniBinDir)...)
allPlugins = append(allPlugins, kubenet.NewPlugin(cniBinDir))
return allPlugins
}