From 2a9228eb3c0ecabd2c513691820a731ae7654646 Mon Sep 17 00:00:00 2001 From: Sergey Kanzhelev Date: Mon, 14 Sep 2020 18:50:24 +0000 Subject: [PATCH] follow up cleanup after SupportPodPidLimits GA --- staging/src/k8s.io/kubelet/config/v1beta1/types.go | 1 - test/e2e_node/pids_test.go | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/staging/src/k8s.io/kubelet/config/v1beta1/types.go b/staging/src/k8s.io/kubelet/config/v1beta1/types.go index 49e848077d7..d298f3c4b21 100644 --- a/staging/src/k8s.io/kubelet/config/v1beta1/types.go +++ b/staging/src/k8s.io/kubelet/config/v1beta1/types.go @@ -482,7 +482,6 @@ type KubeletConfiguration struct { // +optional PodCIDR string `json:"podCIDR,omitempty"` // PodPidsLimit is the maximum number of pids in any pod. - // Requires the SupportPodPidsLimit feature gate to be enabled. // Dynamic Kubelet Config (beta): If dynamically updating this field, consider that // lowering it may prevent container processes from forking after the change. // Default: -1 diff --git a/test/e2e_node/pids_test.go b/test/e2e_node/pids_test.go index 8fef2ce2f21..b455e0945ac 100644 --- a/test/e2e_node/pids_test.go +++ b/test/e2e_node/pids_test.go @@ -120,11 +120,8 @@ func runPodPidsLimitTests(f *framework.Framework) { // Serial because the test updates kubelet configuration. var _ = SIGDescribe("PodPidsLimit [Serial]", func() { f := framework.NewDefaultFramework("pids-limit-test") - ginkgo.Context("With config updated with pids feature enabled", func() { + ginkgo.Context("With config updated with pids limits", func() { tempSetCurrentKubeletConfig(f, func(initialConfig *kubeletconfig.KubeletConfiguration) { - if initialConfig.FeatureGates == nil { - initialConfig.FeatureGates = make(map[string]bool) - } initialConfig.PodPidsLimit = int64(1024) }) runPodPidsLimitTests(f)