github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-13 05:02:50 +00:00
Code Issues Projects Releases Wiki Activity

kubenet: accept a list of CNI binary plugin paths

Browse Source
This commit is contained in:
Dan Williams
2018-01-23 14:03:51 -06:00
parent 69ac723b78
commit ee2ea223e7
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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