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

This reverts commit fd0a95dd12.
This commit is contained in:
Dawn Chen
2015-06-24 11:10:10 -07:00
parent cf2bd9a18d
commit 6ddfa512de
11 changed files with 147 additions and 40 deletions

View File

@@ -127,6 +127,7 @@ func newTestKubelet(t *testing.T) *TestKubelet {
}
kubelet.volumeManager = newVolumeManager()
kubelet.containerManager, _ = newContainerManager(mockCadvisor, "", "", "")
kubelet.networkConfigured = true
return &TestKubelet{kubelet, fakeRuntime, mockCadvisor, fakeKubeClient, fakeMirrorClient}
}