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

@@ -812,8 +812,6 @@ func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) {
kubelet.updateRuntimeUp()
checkNodeStatus(v1.ConditionFalse, "KubeletNotReady")
// Test cri integration.
kubelet.kubeletConfiguration.EnableCRI = true
fakeRuntime.StatusErr = nil
// Should report node not ready if runtime status is nil.