Remove the deprecated --enable-cri flag

Except for rkt, CRI is the default and only integration point for
container runtimes.
This commit is contained in:
Yu-Ju Hong
2017-05-01 14:39:51 -07:00
parent 3ddbed969b
commit daa329c9ae
14 changed files with 32 additions and 108 deletions

View File

@@ -143,6 +143,14 @@ func newTestKubeletWithImageList(
fakeRuntime.RuntimeType = "test"
fakeRuntime.VersionInfo = "1.5.0"
fakeRuntime.ImageList = imageList
// Set ready conditions by default.
fakeRuntime.RuntimeStatus = &kubecontainer.RuntimeStatus{
Conditions: []kubecontainer.RuntimeCondition{
{Type: "RuntimeReady", Status: true},
{Type: "NetworkReady", Status: true},
},
}
fakeRecorder := &record.FakeRecorder{}
fakeKubeClient := &fake.Clientset{}
kubelet := &Kubelet{}