From ac97fc22f6fba0d3ab67217607a7d5ce71a8ae1c Mon Sep 17 00:00:00 2001 From: Random-Liu Date: Wed, 15 Feb 2017 16:56:23 -0800 Subject: [PATCH] Revert #41460. --- pkg/kubemark/hollow_kubelet.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/kubemark/hollow_kubelet.go b/pkg/kubemark/hollow_kubelet.go index 92f3e329baf..aef207aa94d 100644 --- a/pkg/kubemark/hollow_kubelet.go +++ b/pkg/kubemark/hollow_kubelet.go @@ -160,8 +160,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)