Merge pull request #8698 from vmarmol/with-limits

Reserve node resources for node services
2015-06-02 13:05:29 -07:00
parent 00005f4da8 7283e662b5
commit 0a28edf6e7
6 changed files with 134 additions and 56 deletions
--- a/pkg/kubelet/kubelet_test.go
+++ b/pkg/kubelet/kubelet_test.go
@@ -124,6 +124,7 @@ func newTestKubelet(t *testing.T) *TestKubelet {
 		t:            t,
 	}
 	kubelet.volumeManager = newVolumeManager()
+	kubelet.containerManager, _ = newContainerManager("", "", "")
 	return &TestKubelet{kubelet, fakeDocker, mockCadvisor, fakeKubeClient, fakeMirrorClient}
 }

@@ -233,6 +234,7 @@ func newTestKubeletWithFakeRuntime(t *testing.T) *TestKubeletWithFakeRuntime {
 		t:            t,
 	}
 	kubelet.volumeManager = newVolumeManager()
+	kubelet.containerManager, _ = newContainerManager("", "", "")
 	return &TestKubeletWithFakeRuntime{kubelet, fakeRuntime, mockCadvisor, fakeKubeClient, fakeMirrorClient}
 }