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

Merge pull request #10639 from caseydavenport/master

Browse Source 
Allow specification of a network plugins directory when starting kubelet
This commit is contained in:
Mike Danese
2015-07-24 11:09:11 -07:00
parent 859f440f74 db3650fe58
commit b51b4e740f
5 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/mesos/pkg/executor/service/service.go
View File

@@ -240,7 +240,7 @@ func (s *KubeletExecutorServer) Run(hks hyperkube.Interface, _ []string) error {
KubeClient: apiclient,
MasterServiceNamespace: s.MasterServiceNamespace,
VolumePlugins: app.ProbeVolumePlugins(),
NetworkPlugins: app.ProbeNetworkPlugins(),
NetworkPlugins: app.ProbeNetworkPlugins(s.NetworkPluginDir),
NetworkPluginName: s.NetworkPluginName,
StreamingConnectionIdleTimeout: s.StreamingConnectionIdleTimeout,
TLSOptions: tlsOptions,