github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4563 from xiang90/syncpod

Browse Source 
pkg/kubelet: recreate infra pod if the pod is changed
This commit is contained in:
Dawn Chen
2015-02-20 00:29:26 -08:00
parent 530c1559e1 0e20f7d736
commit efac150039
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/kubelet_test.go
View File

@@ -931,7 +931,7 @@ func TestSyncPodBadHash(t *testing.T) {
t.Errorf("unexpected error: %v", err)
}
verifyCalls(t, fakeDocker, []string{"list", "stop", "stop", "list", "create", "start"})
verifyCalls(t, fakeDocker, []string{"list", "stop", "list", "create", "start", "stop", "create", "start"})
// A map interation is used to delete containers, so must not depend on
// order here.