From 1c0d021de8e175239b195b6149466b318a902929 Mon Sep 17 00:00:00 2001 From: Robert Krawitz Date: Fri, 5 Apr 2019 15:08:57 -0400 Subject: [PATCH] Graduate SupportNodePidsLimit to beta --- pkg/features/kube_features.go | 4 ++-- test/e2e_node/node_container_manager_test.go | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 61f2bb93745..843cb9e1203 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -418,7 +418,7 @@ const ( CSIMigrationAWS utilfeature.Feature = "CSIMigrationAWS" // owner: @RobertKrawitz - // alpha: v1.14 + // beta: v1.15 // // Implement support for limiting pids in nodes SupportNodePidsLimit utilfeature.Feature = "SupportNodePidsLimit" @@ -479,7 +479,7 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS ResourceLimitsPriorityFunction: {Default: false, PreRelease: utilfeature.Alpha}, SupportIPVSProxyMode: {Default: true, PreRelease: utilfeature.GA}, SupportPodPidsLimit: {Default: true, PreRelease: utilfeature.Beta}, - SupportNodePidsLimit: {Default: false, PreRelease: utilfeature.Alpha}, + SupportNodePidsLimit: {Default: true, PreRelease: utilfeature.Beta}, HyperVContainer: {Default: false, PreRelease: utilfeature.Alpha}, ScheduleDaemonSetPods: {Default: true, PreRelease: utilfeature.Beta}, TokenRequest: {Default: true, PreRelease: utilfeature.Beta}, diff --git a/test/e2e_node/node_container_manager_test.go b/test/e2e_node/node_container_manager_test.go index 55721054650..a15631ec798 100644 --- a/test/e2e_node/node_container_manager_test.go +++ b/test/e2e_node/node_container_manager_test.go @@ -29,7 +29,6 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/features" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/cm" "k8s.io/kubernetes/pkg/kubelet/stats/pidlimit" @@ -40,7 +39,6 @@ import ( ) func setDesiredConfiguration(initialConfig *kubeletconfig.KubeletConfiguration) { - initialConfig.FeatureGates[string(features.SupportNodePidsLimit)] = true initialConfig.EnforceNodeAllocatable = []string{"pods", kubeReservedCgroup, systemReservedCgroup} initialConfig.SystemReserved = map[string]string{ string(v1.ResourceCPU): "100m",