From d36facd048fdc47c667d3a91a7cd083f6282eeb4 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Sat, 6 Apr 2019 13:59:16 -0700 Subject: [PATCH] Remove SupportNodePidsLimit --- cmd/kubelet/app/server.go | 2 +- pkg/features/kube_features.go | 7 ------- pkg/kubelet/cm/cgroup_manager_linux.go | 6 +++--- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 1bbe1cd13d..9e6fda4467 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -1160,7 +1160,7 @@ func parseResourceList(m map[string]string) (v1.ResourceList, error) { switch v1.ResourceName(k) { // CPU, memory, local storage, and PID resources are supported. case v1.ResourceCPU, v1.ResourceMemory, v1.ResourceEphemeralStorage, pidlimit.PIDs: - if v1.ResourceName(k) != pidlimit.PIDs || utilfeature.DefaultFeatureGate.Enabled(features.SupportNodePidsLimit) { + if v1.ResourceName(k) != pidlimit.PIDs { q, err := resource.ParseQuantity(v) if err != nil { return nil, err diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 1fd3124868..355d2387b2 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -306,12 +306,6 @@ const ( // Enables the AWS EBS in-tree driver to AWS EBS CSI Driver migration feature. CSIMigrationAWS utilfeature.Feature = "CSIMigrationAWS" - // owner: @RobertKrawitz - // alpha: v1.14 - // - // Implement support for limiting pids in nodes - SupportNodePidsLimit utilfeature.Feature = "SupportNodePidsLimit" - // owner: @wk8 // alpha: v1.14 // @@ -360,7 +354,6 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS StorageObjectInUseProtection: {Default: true, PreRelease: utilfeature.GA}, SupportIPVSProxyMode: {Default: true, PreRelease: utilfeature.GA}, SupportPodPidsLimit: {Default: true, PreRelease: utilfeature.Beta}, - SupportNodePidsLimit: {Default: false, PreRelease: utilfeature.Alpha}, ScheduleDaemonSetPods: {Default: true, PreRelease: utilfeature.Beta}, TokenRequest: {Default: true, PreRelease: utilfeature.Beta}, TokenRequestProjection: {Default: true, PreRelease: utilfeature.Beta}, diff --git a/pkg/kubelet/cm/cgroup_manager_linux.go b/pkg/kubelet/cm/cgroup_manager_linux.go index b6ed56c4dd..fa10d4d638 100644 --- a/pkg/kubelet/cm/cgroup_manager_linux.go +++ b/pkg/kubelet/cm/cgroup_manager_linux.go @@ -259,7 +259,7 @@ func (m *cgroupManagerImpl) Exists(name CgroupName) bool { // in https://github.com/opencontainers/runc/issues/1440 // once resolved, we can remove this code. whitelistControllers := sets.NewString("cpu", "cpuacct", "cpuset", "memory", "systemd") - if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.SupportPodPidsLimit) || utilfeature.DefaultFeatureGate.Enabled(kubefeatures.SupportNodePidsLimit) { + if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.SupportPodPidsLimit) { whitelistControllers.Insert("pids") } var missingPaths []string @@ -332,7 +332,7 @@ func getSupportedSubsystems() map[subsystem]bool { } // not all hosts support hugetlb cgroup, and in the absent of hugetlb, we will fail silently by reporting no capacity. supportedSubsystems[&cgroupfs.HugetlbGroup{}] = false - if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.SupportPodPidsLimit) || utilfeature.DefaultFeatureGate.Enabled(kubefeatures.SupportNodePidsLimit) { + if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.SupportPodPidsLimit) { supportedSubsystems[&cgroupfs.PidsGroup{}] = true } return supportedSubsystems @@ -381,7 +381,7 @@ func (m *cgroupManagerImpl) toResources(resourceConfig *ResourceConfig) *libcont if resourceConfig.CpuPeriod != nil { resources.CpuPeriod = *resourceConfig.CpuPeriod } - if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.SupportPodPidsLimit) || utilfeature.DefaultFeatureGate.Enabled(kubefeatures.SupportNodePidsLimit) { + if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.SupportPodPidsLimit) { if resourceConfig.PidsLimit != nil { resources.PidsLimit = *resourceConfig.PidsLimit }