github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

pass NetworkPluginDir to kubenet

Browse Source
This commit is contained in:
Minhan Xia
2016-06-02 15:49:21 -07:00
parent 0a2a7a9d6a
commit e9f8c70eaf
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,7 +92,7 @@ func ProbeNetworkPlugins(pluginDir string) []network.NetworkPlugin {
// for each existing plugin, add to the list
allPlugins = append(allPlugins, exec.ProbeNetworkPlugins(pluginDir)...)
allPlugins = append(allPlugins, cni.ProbeNetworkPlugins(pluginDir)...)
allPlugins = append(allPlugins, kubenet.NewPlugin())
allPlugins = append(allPlugins, kubenet.NewPlugin(pluginDir))
return allPlugins
}