KEP-4540: moved StrictCPUReservationOption to beta feature gate

Author: psasnal

pkg/kubelet/cm/cpumanager/policy_options.go

@@ -42,11 +42,11 @@ var (
 		DistributeCPUsAcrossNUMAOption,
 		AlignBySocketOption,
 		DistributeCPUsAcrossCoresOption,
-		StrictCPUReservationOption,
 		PreferAlignByUnCoreCacheOption,
 	)
 	betaOptions = sets.New[string](
 		FullPCPUsOnlyOption,
+		StrictCPUReservationOption,
 	)
 	stableOptions = sets.New[string]()
 )

pkg/kubelet/cm/cpumanager/policy_options_test.go

@@ -120,15 +120,15 @@ func TestPolicyOptionsAvailable(t *testing.T) {
 		},
 		{
 			option:            StrictCPUReservationOption,
-			featureGate:       pkgfeatures.CPUManagerPolicyAlphaOptions,
-			featureGateEnable: true,
-			expectedAvailable: true,
+			featureGate:       pkgfeatures.CPUManagerPolicyBetaOptions,
+			featureGateEnable: false,
+			expectedAvailable: false,
 		},
 		{
 			option:            StrictCPUReservationOption,
 			featureGate:       pkgfeatures.CPUManagerPolicyBetaOptions,
 			featureGateEnable: true,
-			expectedAvailable: false,
+			expectedAvailable: true,
 		},
 	}
 	for _, testCase := range testCases {

pkg/kubelet/cm/cpumanager/policy_static_test.go

@@ -170,7 +170,6 @@ func TestStaticPolicyStart(t *testing.T) {
 	}
 	for _, testCase := range testCases {
 		t.Run(testCase.description, func(t *testing.T) {
-			featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, pkgfeatures.CPUManagerPolicyAlphaOptions, true)
 			p, err := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.New(), topologymanager.NewFakeManager(), testCase.options)
 			if err != nil {
 				t.Fatalf("NewStaticPolicy() failed: %v", err)
@@ -1050,7 +1049,6 @@ func TestStaticPolicyStartWithResvList(t *testing.T) {
 	}
 	for _, testCase := range testCases {
 		t.Run(testCase.description, func(t *testing.T) {
-			featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, pkgfeatures.CPUManagerPolicyAlphaOptions, true)
 			p, err := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, testCase.reserved, topologymanager.NewFakeManager(), testCase.cpuPolicyOptions)
 			if !reflect.DeepEqual(err, testCase.expNewErr) {
 				t.Errorf("StaticPolicy Start() error (%v). expected error: %v but got: %v",