Allow specification of network plugins directory when starting kubelet

2015-07-01 11:53:42 -07:00
parent 9fef5649fe
commit aeb7dc6b30
4 changed files with 13 additions and 15 deletions
--- a/cmd/kubelet/app/plugins.go
+++ b/cmd/kubelet/app/plugins.go
@@ -69,11 +69,11 @@ func ProbeVolumePlugins() []volume.VolumePlugin {
 }

 // ProbeNetworkPlugins collects all compiled-in plugins
-func ProbeNetworkPlugins() []network.NetworkPlugin {
+func ProbeNetworkPlugins(pluginDir string) []network.NetworkPlugin {
 	allPlugins := []network.NetworkPlugin{}

 	// for each existing plugin, add to the list
-	allPlugins = append(allPlugins, exec.ProbeNetworkPlugins()...)
+	allPlugins = append(allPlugins, exec.ProbeNetworkPlugins(pluginDir)...)

 	return allPlugins
 }