From 36f4256afd670b3cae625c02d07ddd9a690571fa Mon Sep 17 00:00:00 2001
From: Derek Carr <decarr@redhat.com>
Date: Fri, 24 Feb 2017 10:16:41 -0500
Subject: [PATCH] Disble cgroups-per-qos pending Burstable/cpu.shares being set

---
 pkg/apis/componentconfig/v1alpha1/defaults.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg/apis/componentconfig/v1alpha1/defaults.go b/pkg/apis/componentconfig/v1alpha1/defaults.go
index ee0bec30711..9166d018c87 100644
--- a/pkg/apis/componentconfig/v1alpha1/defaults.go
+++ b/pkg/apis/componentconfig/v1alpha1/defaults.go
@@ -392,7 +392,10 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) {
 		obj.IPTablesDropBit = &temp
 	}
 	if obj.CgroupsPerQOS == nil {
-		temp := true
+		// disabled pending merge of https://github.com/kubernetes/kubernetes/pull/41753
+		// as enabling the new hierarchy without setting /Burstable/cpu.shares may cause
+		// regression.
+		temp := false
 		obj.CgroupsPerQOS = &temp
 	}
 	if obj.CgroupDriver == "" {