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 <fromani@redhat.com>
This commit is contained in:
Francesco Romani
2026-02-09 08:24:50 +01:00
parent 9bc91a75d3
commit 9dc40c8545

View File

@@ -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
},