Merge pull request openshift#7110 from eggfoobar/feat_remove_techpreview_cpu

openshift-merge-robot · web-flow · commit ea82de6f1352 · 2023-04-19T23:59:36.000-04:00
OCPBUGS-11999: fix: remove feature flag for cpu partitioning no longer needed
diff --git a/pkg/asset/manifests/topologies.go b/pkg/asset/manifests/topologies.go
@@ -33,9 +33,6 @@ func determineTopologies(installConfig *types.InstallConfig) (controlPlaneTopolo
 }
 
 func determineCPUPartitioning(installConfig *types.InstallConfig) configv1.CPUPartitioningMode {
-	if installConfig.FeatureSet != configv1.TechPreviewNoUpgrade {
-		return configv1.CPUPartitioningNone
-	}
 	switch installConfig.CPUPartitioning {
 	case types.CPUPartitioningAllNodes:
 		return configv1.CPUPartitioningAllNodes

Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,6 @@ func determineTopologies(installConfig *types.InstallConfig) (controlPlaneTopolo`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func determineCPUPartitioning(installConfig *types.InstallConfig) configv1.CPUPartitioningMode {`
`36`		`- if installConfig.FeatureSet != configv1.TechPreviewNoUpgrade {`
`37`		`- return configv1.CPUPartitioningNone`
`38`		`- }`
`39`	`36`	`switch installConfig.CPUPartitioning {`
`40`	`37`	`case types.CPUPartitioningAllNodes:`
`41`	`38`	`return configv1.CPUPartitioningAllNodes`