Merge pull request kubernetes#130535 from ffromani/cpumanager-policy-options-ga

k8s-ci-robot · web-flow · commit 6bc352f6a931 · 2025-03-20T11:24:46.000-07:00
node: kep-2625: cpu manager policy options GA
diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go
@@ -826,14 +826,6 @@ func run(ctx context.Context, s *options.KubeletServer, kubeDeps *kubelet.Depend
 			return fmt.Errorf("--qos-reserved value failed to parse: %w", err)
 		}
 
-		var cpuManagerPolicyOptions map[string]string
-		if utilfeature.DefaultFeatureGate.Enabled(features.CPUManagerPolicyOptions) {
-			cpuManagerPolicyOptions = s.CPUManagerPolicyOptions
-		} else if s.CPUManagerPolicyOptions != nil {
-			return fmt.Errorf("CPU Manager policy options %v require feature gates %q, %q enabled",
-				s.CPUManagerPolicyOptions, features.CPUManager, features.CPUManagerPolicyOptions)
-		}
-
 		var topologyManagerPolicyOptions map[string]string
 		if utilfeature.DefaultFeatureGate.Enabled(features.TopologyManagerPolicyOptions) {
 			topologyManagerPolicyOptions = s.TopologyManagerPolicyOptions
@@ -877,7 +869,7 @@ func run(ctx context.Context, s *options.KubeletServer, kubeDeps *kubelet.Depend
 				},
 				QOSReserved:                  *experimentalQOSReserved,
 				CPUManagerPolicy:             s.CPUManagerPolicy,
-				CPUManagerPolicyOptions:      cpuManagerPolicyOptions,
+				CPUManagerPolicyOptions:      s.CPUManagerPolicyOptions,
 				CPUManagerReconcilePeriod:    s.CPUManagerReconcilePeriod.Duration,
 				MemoryManagerPolicy:          s.MemoryManagerPolicy,
 				MemoryManagerReservedMemory:  s.ReservedMemory,
diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh
@@ -167,8 +167,7 @@ function usage {
             echo "Example 1: hack/local-up-cluster.sh -o _output/dockerized/bin/linux/amd64/ (run from docker output)"
             echo "Example 2: hack/local-up-cluster.sh -O (auto-guess the bin path for your platform)"
             echo "Example 3: hack/local-up-cluster.sh (build a local copy of the source)"
-            echo "Example 4: FEATURE_GATES=CPUManagerPolicyOptions=true \\"
-            echo "           TOPOLOGY_MANAGER_POLICY=\"single-numa-node\" \\"
+            echo "Example 4: TOPOLOGY_MANAGER_POLICY=\"single-numa-node\" \\"
             echo "           CPUMANAGER_POLICY=\"static\" \\"
             echo "           CPUMANAGER_POLICY_OPTIONS=full-pcpus-only=\"true\" \\"
             echo "           CPUMANAGER_RECONCILE_PERIOD=\"5s\" \\"
diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go
@@ -114,7 +114,7 @@ const (
 	// for details about the removal of this feature gate.
 	CPUManagerPolicyBetaOptions featuregate.Feature = "CPUManagerPolicyBetaOptions"
 
-	// owner: @fromanirh
+	// owner: @ffromani
 	//
 	// Allow the usage of options to fine-tune the cpumanager policies.
 	CPUManagerPolicyOptions featuregate.Feature = "CPUManagerPolicyOptions"
@@ -1049,6 +1049,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
 	CPUManagerPolicyOptions: {
 		{Version: version.MustParse("1.22"), Default: false, PreRelease: featuregate.Alpha},
 		{Version: version.MustParse("1.23"), Default: true, PreRelease: featuregate.Beta},
+		{Version: version.MustParse("1.33"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.36
 	},
 
 	CronJobsScheduledAnnotation: {
diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go
diff --git a/pkg/kubelet/apis/config/types.go b/pkg/kubelet/apis/config/types.go
@@ -257,7 +257,6 @@ type KubeletConfiguration struct {
 	CPUManagerPolicy string
 	// CPUManagerPolicyOptions is a set of key=value which 	allows to set extra options
 	// to fine tune the behaviour of the cpu manager policies.
-	// Requires  both the "CPUManager" and "CPUManagerPolicyOptions" feature gates to be enabled.
 	CPUManagerPolicyOptions map[string]string
 	// CPU Manager reconciliation period.
 	// Requires the CPUManager feature gate to be enabled.
diff --git a/pkg/kubelet/cm/cpumanager/policy_options.go b/pkg/kubelet/cm/cpumanager/policy_options.go
@@ -44,11 +44,12 @@ var (
 		PreferAlignByUnCoreCacheOption,
 	)
 	betaOptions = sets.New[string](
-		FullPCPUsOnlyOption,
 		StrictCPUReservationOption,
 		DistributeCPUsAcrossNUMAOption,
 	)
-	stableOptions = sets.New[string]()
+	stableOptions = sets.New[string](
+		FullPCPUsOnlyOption,
+	)
 )
 
 // CheckPolicyOptionAvailable verifies if the given option can be used depending on the Feature Gate Settings.
@@ -66,6 +67,7 @@ func CheckPolicyOptionAvailable(option string) error {
 		return fmt.Errorf("CPU Manager Policy Beta-level Options not enabled, but option %q provided", option)
 	}
 
+	// if the option is stable, we need no CPUManagerPolicy*Options feature gate check
 	return nil
 }
 
diff --git a/pkg/kubelet/cm/cpumanager/policy_options_test.go b/pkg/kubelet/cm/cpumanager/policy_options_test.go
@@ -70,18 +70,6 @@ func TestPolicyOptionsAvailable(t *testing.T) {
 			featureGateEnable: true,
 			expectedAvailable: false,
 		},
-		{
-			option:            FullPCPUsOnlyOption,
-			featureGate:       pkgfeatures.CPUManagerPolicyBetaOptions,
-			featureGateEnable: true,
-			expectedAvailable: true,
-		},
-		{
-			option:            FullPCPUsOnlyOption,
-			featureGate:       pkgfeatures.CPUManagerPolicyBetaOptions,
-			featureGateEnable: false,
-			expectedAvailable: false,
-		},
 		{
 			option:            AlignBySocketOption,
 			featureGate:       pkgfeatures.CPUManagerPolicyAlphaOptions,
@@ -143,6 +131,21 @@ func TestPolicyOptionsAvailable(t *testing.T) {
 	}
 }
 
+func TestPolicyOptionsAlwaysAvailableOnceGA(t *testing.T) {
+	options := []string{
+		FullPCPUsOnlyOption,
+	}
+	for _, option := range options {
+		t.Run(option, func(t *testing.T) {
+			featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, pkgfeatures.CPUManagerPolicyAlphaOptions, false)
+			featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, pkgfeatures.CPUManagerPolicyBetaOptions, false)
+			if err := CheckPolicyOptionAvailable(option); err != nil {
+				t.Errorf("option %q should be available even with all featuregate disabled", option)
+			}
+		})
+	}
+}
+
 func TestValidateStaticPolicyOptions(t *testing.T) {
 	testCases := []struct {
 		description   string
diff --git a/staging/src/k8s.io/kubelet/config/v1beta1/types.go b/staging/src/k8s.io/kubelet/config/v1beta1/types.go
@@ -406,7 +406,6 @@ type KubeletConfiguration struct {
 	SingleProcessOOMKill *bool `json:"singleProcessOOMKill,omitempty"`
 	// cpuManagerPolicyOptions is a set of key=value which 	allows to set extra options
 	// to fine tune the behaviour of the cpu manager policies.
-	// Requires  both the "CPUManager" and "CPUManagerPolicyOptions" feature gates to be enabled.
 	// Default: nil
 	// +optional
 	CPUManagerPolicyOptions map[string]string `json:"cpuManagerPolicyOptions,omitempty"`
diff --git a/test/compatibility_lifecycle/reference/versioned_feature_list.yaml b/test/compatibility_lifecycle/reference/versioned_feature_list.yaml
@@ -303,6 +303,10 @@
     lockToDefault: false
     preRelease: Beta
     version: "1.23"
+  - default: true
+    lockToDefault: true
+    preRelease: GA
+    version: "1.33"
 - name: CRDValidationRatcheting
   versionedSpecs:
   - default: false
diff --git a/test/e2e_node/cpu_manager_test.go b/test/e2e_node/cpu_manager_test.go
@@ -303,7 +303,6 @@ func configureCPUManagerInKubelet(oldCfg *kubeletconfig.KubeletConfiguration, ku
 		newCfg.FeatureGates = make(map[string]bool)
 	}
 
-	newCfg.FeatureGates["CPUManagerPolicyOptions"] = kubeletArguments.enableCPUManagerOptions
 	newCfg.FeatureGates["CPUManagerPolicyBetaOptions"] = kubeletArguments.enableCPUManagerOptions
 	newCfg.FeatureGates["CPUManagerPolicyAlphaOptions"] = kubeletArguments.enableCPUManagerOptions
 	newCfg.FeatureGates["DisableCPUQuotaWithExclusiveCPUs"] = kubeletArguments.disableCPUQuotaWithExclusiveCPUs

Original file line number	Diff line number	Diff line change
`@@ -44,11 +44,12 @@ var (`
`44`	`44`	`PreferAlignByUnCoreCacheOption,`
`45`	`45`	`)`
`46`	`46`	`betaOptions = sets.New[string](`
`47`		`- FullPCPUsOnlyOption,`
`48`	`47`	`StrictCPUReservationOption,`
`49`	`48`	`DistributeCPUsAcrossNUMAOption,`
`50`	`49`	`)`
`51`		`- stableOptions = sets.New[string]()`
	`50`	`+ stableOptions = sets.New[string](`
	`51`	`+ FullPCPUsOnlyOption,`
	`52`	`+ )`
`52`	`53`	`)`
`53`	`54`
`54`	`55`	`// CheckPolicyOptionAvailable verifies if the given option can be used depending on the Feature Gate Settings.`
`@@ -66,6 +67,7 @@ func CheckPolicyOptionAvailable(option string) error {`
`66`	`67`	`return fmt.Errorf("CPU Manager Policy Beta-level Options not enabled, but option %q provided", option)`
`67`	`68`	`}`
`68`	`69`
	`70`	`+ // if the option is stable, we need no CPUManagerPolicy*Options feature gate check`
`69`	`71`	`return nil`
`70`	`72`	`}`
`71`	`73`
Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,6 @@ func configureCPUManagerInKubelet(oldCfg *kubeletconfig.KubeletConfiguration, ku`
`303`	`303`	`newCfg.FeatureGates = make(map[string]bool)`
`304`	`304`	`}`
`305`	`305`
`306`		`- newCfg.FeatureGates["CPUManagerPolicyOptions"] = kubeletArguments.enableCPUManagerOptions`
`307`	`306`	`newCfg.FeatureGates["CPUManagerPolicyBetaOptions"] = kubeletArguments.enableCPUManagerOptions`
`308`	`307`	`newCfg.FeatureGates["CPUManagerPolicyAlphaOptions"] = kubeletArguments.enableCPUManagerOptions`
`309`	`308`	`newCfg.FeatureGates["DisableCPUQuotaWithExclusiveCPUs"] = kubeletArguments.disableCPUQuotaWithExclusiveCPUs`