github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-16 22:53:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10312 from dchen1107/cleanup

Browse Source 
Take 2: Fix the race between configuring cbr0 and restarting static pods
This commit is contained in:
Maxwell Forbes
2015-06-24 17:59:50 -07:00
parent 66752bfb93 710fb4e413
commit 3afda5d566
11 changed files with 166 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,
)