From 9dc40c8545893f849a656192ee9b4b996122211a Mon Sep 17 00:00:00 2001 From: Francesco Romani Date: Mon, 9 Feb 2026 08:24:50 +0100 Subject: [PATCH] kubelet: api: validation: remove CustomCPUCFSQuotaPeriod setting we moved the FG to default on, so we don't need to enable it explictly anymore. Signed-off-by: Francesco Romani --- pkg/kubelet/apis/config/validation/validation_test.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkg/kubelet/apis/config/validation/validation_test.go b/pkg/kubelet/apis/config/validation/validation_test.go index 7e684697004..b6b2e3f947a 100644 --- a/pkg/kubelet/apis/config/validation/validation_test.go +++ b/pkg/kubelet/apis/config/validation/validation_test.go @@ -72,7 +72,6 @@ var ( ShutdownGracePeriodCriticalPods: metav1.Duration{Duration: 10 * time.Second}, MemoryThrottlingFactor: ptr.To(0.9), FeatureGates: map[string]bool{ - "CustomCPUCFSQuotaPeriod": true, "GracefulNodeShutdown": true, "MemoryQoS": true, "KubeletCrashLoopBackOffMax": true, @@ -165,7 +164,6 @@ func TestValidateKubeletConfiguration(t *testing.T) { }, { name: "invalid CPUCFSQuotaPeriod", configure: func(conf *kubeletconfig.KubeletConfiguration) *kubeletconfig.KubeletConfiguration { - conf.FeatureGates = map[string]bool{"CustomCPUCFSQuotaPeriod": true} conf.CPUCFSQuotaPeriod = metav1.Duration{Duration: 2 * time.Second} return conf }, @@ -417,7 +415,7 @@ func TestValidateKubeletConfiguration(t *testing.T) { }, { name: "CrashLoopBackOff.MaxContainerRestartPeriod just a little too high", configure: func(conf *kubeletconfig.KubeletConfiguration) *kubeletconfig.KubeletConfiguration { - conf.FeatureGates = map[string]bool{"KubeletCrashLoopBackOffMax": true, "CustomCPUCFSQuotaPeriod": true} + conf.FeatureGates = map[string]bool{"KubeletCrashLoopBackOffMax": true} conf.CrashLoopBackOff = kubeletconfig.CrashLoopBackOffConfig{ // 300.9 seconds MaxContainerRestartPeriod: &metav1.Duration{Duration: 300900 * time.Millisecond}, @@ -429,7 +427,7 @@ func TestValidateKubeletConfiguration(t *testing.T) { { name: "CrashLoopBackOff.MaxContainerRestartPeriod just a little too low", configure: func(conf *kubeletconfig.KubeletConfiguration) *kubeletconfig.KubeletConfiguration { - conf.FeatureGates = map[string]bool{"KubeletCrashLoopBackOffMax": true, "CustomCPUCFSQuotaPeriod": true} + conf.FeatureGates = map[string]bool{"KubeletCrashLoopBackOffMax": true} conf.CrashLoopBackOff = kubeletconfig.CrashLoopBackOffConfig{ // 300.9 seconds MaxContainerRestartPeriod: &metav1.Duration{Duration: 999 * time.Millisecond}, @@ -441,13 +439,13 @@ func TestValidateKubeletConfiguration(t *testing.T) { { name: "KubeletCrashLoopBackOffMax feature gate on, no crashLoopBackOff config, ok", configure: func(conf *kubeletconfig.KubeletConfiguration) *kubeletconfig.KubeletConfiguration { - conf.FeatureGates = map[string]bool{"KubeletCrashLoopBackOffMax": true, "CustomCPUCFSQuotaPeriod": true} + conf.FeatureGates = map[string]bool{"KubeletCrashLoopBackOffMax": true} return conf }, }, { name: "KubeletCrashLoopBackOffMax feature gate on, but no crashLoopBackOff.MaxContainerRestartPeriod config", configure: func(conf *kubeletconfig.KubeletConfiguration) *kubeletconfig.KubeletConfiguration { - conf.FeatureGates = map[string]bool{"KubeletCrashLoopBackOffMax": true, "CustomCPUCFSQuotaPeriod": true} + conf.FeatureGates = map[string]bool{"KubeletCrashLoopBackOffMax": true} conf.CrashLoopBackOff = kubeletconfig.CrashLoopBackOffConfig{} return conf },