From 6578d5e842b0086cb6df9df4925c03ab2f02510e Mon Sep 17 00:00:00 2001
From: Yu-Ju Hong <yjhong@google.com>
Date: Tue, 7 Mar 2017 22:01:41 -0800
Subject: [PATCH] Revert "kubemark: enable CRI for the hollow nodes"

This reverts commit c89e9cdbf109c569bff06e5db8354402bd440ffd.
---
 pkg/kubemark/hollow_kubelet.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/kubemark/hollow_kubelet.go b/pkg/kubemark/hollow_kubelet.go
index 7ae05f2fb7f..ef38f444e58 100644
--- a/pkg/kubemark/hollow_kubelet.go
+++ b/pkg/kubemark/hollow_kubelet.go
@@ -159,6 +159,8 @@ 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)