scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-30 21:33:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix the race between configuring cbr0 and restarting static pods"

Browse Source
This commit is contained in:
Piotr Szczesniak
2015-06-24 09:56:49 +02:00
parent 5b4dc4edaa
commit fd0a95dd12
11 changed files with 40 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -354,7 +354,6 @@ func (ks *KubeletExecutorServer) createAndInitKubelet(
kc.DockerDaemonContainer,
kc.SystemContainer,
kc.ConfigureCBR0,
kc.PodCIDR,
kc.MaxPods,
kc.DockerExecHandler,
)