Merge pull request kubernetes#130541 from swatisehgal/distribute-across-numa-beta-graduation

k8s-ci-robot · web-flow · commit 648620da0ebd · 2025-03-19T16:12:33.000-07:00
node: cpu-mgr: Graduation of `distribute-cpus-across-numa` policy option to Beta
diff --git a/pkg/kubelet/cm/cpumanager/policy_options.go b/pkg/kubelet/cm/cpumanager/policy_options.go
@@ -39,14 +39,14 @@ const (
 
 var (
 	alphaOptions = sets.New[string](
-		DistributeCPUsAcrossNUMAOption,
 		AlignBySocketOption,
 		DistributeCPUsAcrossCoresOption,
 		PreferAlignByUnCoreCacheOption,
 	)
 	betaOptions = sets.New[string](
 		FullPCPUsOnlyOption,
 		StrictCPUReservationOption,
+		DistributeCPUsAcrossNUMAOption,
 	)
 	stableOptions = sets.New[string]()
 )
diff --git a/pkg/kubelet/cm/cpumanager/policy_options_test.go b/pkg/kubelet/cm/cpumanager/policy_options_test.go
@@ -96,14 +96,14 @@ func TestPolicyOptionsAvailable(t *testing.T) {
 		},
 		{
 			option:            DistributeCPUsAcrossNUMAOption,
-			featureGate:       pkgfeatures.CPUManagerPolicyAlphaOptions,
+			featureGate:       pkgfeatures.CPUManagerPolicyBetaOptions,
 			featureGateEnable: true,
 			expectedAvailable: true,
 		},
 		{
 			option:            DistributeCPUsAcrossNUMAOption,
 			featureGate:       pkgfeatures.CPUManagerPolicyBetaOptions,
-			featureGateEnable: true,
+			featureGateEnable: false,
 			expectedAvailable: false,
 		},
 		{

Original file line number	Diff line number	Diff line change
`@@ -39,14 +39,14 @@ const (`
`39`	`39`
`40`	`40`	`var (`
`41`	`41`	`alphaOptions = sets.New[string](`
`42`		`- DistributeCPUsAcrossNUMAOption,`
`43`	`42`	`AlignBySocketOption,`
`44`	`43`	`DistributeCPUsAcrossCoresOption,`
`45`	`44`	`PreferAlignByUnCoreCacheOption,`
`46`	`45`	`)`
`47`	`46`	`betaOptions = sets.New[string](`
`48`	`47`	`FullPCPUsOnlyOption,`
`49`	`48`	`StrictCPUReservationOption,`
	`49`	`+ DistributeCPUsAcrossNUMAOption,`
`50`	`50`	`)`
`51`	`51`	`stableOptions = sets.New[string]()`
`52`	`52`	`)`
Original file line number	Diff line number	Diff line change
`@@ -96,14 +96,14 @@ func TestPolicyOptionsAvailable(t *testing.T) {`
`96`	`96`	`},`
`97`	`97`	`{`
`98`	`98`	`option: DistributeCPUsAcrossNUMAOption,`
`99`		`- featureGate: pkgfeatures.CPUManagerPolicyAlphaOptions,`
	`99`	`+ featureGate: pkgfeatures.CPUManagerPolicyBetaOptions,`
`100`	`100`	`featureGateEnable: true,`
`101`	`101`	`expectedAvailable: true,`
`102`	`102`	`},`
`103`	`103`	`{`
`104`	`104`	`option: DistributeCPUsAcrossNUMAOption,`
`105`	`105`	`featureGate: pkgfeatures.CPUManagerPolicyBetaOptions,`
`106`		`- featureGateEnable: true,`
	`106`	`+ featureGateEnable: false,`
`107`	`107`	`expectedAvailable: false,`
`108`	`108`	`},`
`109`	`109`	`{`