From 029919a62f66d01df46aad4864361266c7fae19b Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Fri, 5 Oct 2018 10:06:00 -0700
Subject: [PATCH] Remove QOSReserved

---
 pkg/features/kube_features.go                 |  8 ----
 pkg/kubelet/cm/qos_container_manager_linux.go | 37 +------------------
 2 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go
index 9a32da189c..d57ab14e06 100644
--- a/pkg/features/kube_features.go
+++ b/pkg/features/kube_features.go
@@ -126,13 +126,6 @@ const (
 	// 'MemoryPressure', 'PIDPressure' and 'DiskPressure'.
 	TaintNodesByCondition utilfeature.Feature = "TaintNodesByCondition"
 
-	// owner: @sjenning
-	// alpha: v1.11
-	//
-	// Allows resource reservations at the QoS level preventing pods at lower QoS levels from
-	// bursting into resources requested at higher QoS levels (memory only for now)
-	QOSReserved utilfeature.Feature = "QOSReserved"
-
 	// owner: @ConnorDoyle
 	// alpha: v1.8
 	// beta: v1.10
@@ -442,7 +435,6 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
 	PodShareProcessNamespace:                {Default: true, PreRelease: utilfeature.Beta},
 	PodPriority:                             {Default: true, PreRelease: utilfeature.GA},
 	TaintNodesByCondition:                   {Default: true, PreRelease: utilfeature.Beta},
-	QOSReserved:                             {Default: false, PreRelease: utilfeature.Alpha},
 	ExpandPersistentVolumes:                 {Default: true, PreRelease: utilfeature.Beta},
 	ExpandInUsePersistentVolumes:            {Default: false, PreRelease: utilfeature.Alpha},
 	ExpandCSIVolumes:                        {Default: false, PreRelease: utilfeature.Alpha},
diff --git a/pkg/kubelet/cm/qos_container_manager_linux.go b/pkg/kubelet/cm/qos_container_manager_linux.go
index 86604b0ce9..e5389dfd6d 100644
--- a/pkg/kubelet/cm/qos_container_manager_linux.go
+++ b/pkg/kubelet/cm/qos_container_manager_linux.go
@@ -26,14 +26,12 @@ import (
 
 	"k8s.io/apimachinery/pkg/util/wait"
 
-	units "github.com/docker/go-units"
+	"github.com/docker/go-units"
 	cgroupfs "github.com/opencontainers/runc/libcontainer/cgroups/fs"
 	rsystem "github.com/opencontainers/runc/libcontainer/system"
-	"k8s.io/api/core/v1"
-	utilfeature "k8s.io/apiserver/pkg/util/feature"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/kubernetes/pkg/api/v1/resource"
 	v1qos "k8s.io/kubernetes/pkg/apis/core/v1/helper/qos"
-	kubefeatures "k8s.io/kubernetes/pkg/features"
 )
 
 const (
@@ -295,37 +293,6 @@ func (m *qosContainerManagerImpl) UpdateCgroups() error {
 		return err
 	}
 
-	if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.QOSReserved) {
-		for resource, percentReserve := range m.qosReserved {
-			switch resource {
-			case v1.ResourceMemory:
-				m.setMemoryReserve(qosConfigs, percentReserve)
-			}
-		}
-
-		updateSuccess := true
-		for _, config := range qosConfigs {
-			err := m.cgroupManager.Update(config)
-			if err != nil {
-				updateSuccess = false
-			}
-		}
-		if updateSuccess {
-			klog.V(4).Infof("[ContainerManager]: Updated QoS cgroup configuration")
-			return nil
-		}
-
-		// If the resource can adjust the ResourceConfig to increase likelihood of
-		// success, call the adjustment function here.  Otherwise, the Update() will
-		// be called again with the same values.
-		for resource, percentReserve := range m.qosReserved {
-			switch resource {
-			case v1.ResourceMemory:
-				m.retrySetMemoryReserve(qosConfigs, percentReserve)
-			}
-		}
-	}
-
 	updateSuccess := true
 	for _, config := range qosConfigs {
 		err := m.cgroupManager.Update(config)