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

Merge pull request #10211 from dchen1107/cleanup

Browse Source 
Fix the race between configuring cbr0 and restarting static pods
This commit is contained in:
Jeff Lowdermilk
2015-06-23 17:09:01 -07:00
parent 3c0cab7dfe 9dbe6fe4e4
commit 50d50a3cb8
11 changed files with 147 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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