Merge pull request #42814 from yujuhong/cri-kubemark-3rd-time-is-the-charm

Automatic merge from submit-queue (batch tested with PRs 42734, 42745, 42758, 42814, 42694) kubemark: enable CRI in the hollow kubelet

Merge pull request #42814 from yujuhong/cri-kubemark-3rd-time-is-the-charm
5a476716 · Kubernetes Submit Queue · GitHub · 4540674b · 9878c188 · 5a476716
Commit 5a476716 authored Mar 09, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 09, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

hollow_kubelet.go pkg/kubemark/hollow_kubelet.go +0 -2

No files found.
--- a/pkg/kubemark/hollow_kubelet.go
+++ b/pkg/kubemark/hollow_kubelet.go
@@ -159,8 +159,6 @@ func GetHollowKubeletConfig(
 	c.SerializeImagePulls = true
 	c.SystemCgroups = ""
 	c.ProtectKernelDefaults = false
-	// TODO: This is a temporary workaround until we fix CRI+kubemark properly.
-	c.EnableCRI = false

 	// TODO(mtaufen): Note that PodInfraContainerImage was being set to the empty value before,
 	//                but this may not have been intentional. (previous code (SimpleKubelet)