From 9878c1884dc4f5ab1838a241e9312d5a0bca1367 Mon Sep 17 00:00:00 2001 From: Yu-Ju Hong Date: Thu, 9 Mar 2017 09:52:17 -0800 Subject: [PATCH] kubemark: enable CRI in the hollow kubelet --- 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 ef38f444e58..7ae05f2fb7f 100644 --- 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)