Merge pull request openshift#7218 from pawanpinjarkar/warn-new-install-config-field-ABI-4.13

openshift-merge-robot · web-flow · commit 744dd8042275 · 2023-06-05T22:20:42.000-04:00
OCPBUGS-13662: Ignore CPUPartitioning for ABI
diff --git a/pkg/asset/agent/installconfig.go b/pkg/asset/agent/installconfig.go
@@ -390,6 +390,11 @@ func warnUnusedConfig(installConfig *types.InstallConfig) {
 		fieldPath := field.NewPath("BootstrapInPlace", "InstallationDisk")
 		logrus.Warnf(fmt.Sprintf("%s: %s is ignored", fieldPath, installConfig.BootstrapInPlace.InstallationDisk))
 	}
+
+	if installConfig.CPUPartitioning != "None" {
+		fieldPath := field.NewPath("CPUPartitioning")
+		logrus.Warnf(fmt.Sprintf("%s: %s is ignored", fieldPath, installConfig.CPUPartitioning))
+	}
 }
 
 // GetReplicaCount gets the configured master and worker replicas.

Original file line number	Diff line number	Diff line change
`@@ -390,6 +390,11 @@ func warnUnusedConfig(installConfig *types.InstallConfig) {`
`390`	`390`	`fieldPath := field.NewPath("BootstrapInPlace", "InstallationDisk")`
`391`	`391`	`logrus.Warnf(fmt.Sprintf("%s: %s is ignored", fieldPath, installConfig.BootstrapInPlace.InstallationDisk))`
`392`	`392`	`}`
	`393`	`+`
	`394`	`+ if installConfig.CPUPartitioning != "None" {`
	`395`	`+ fieldPath := field.NewPath("CPUPartitioning")`
	`396`	`+ logrus.Warnf(fmt.Sprintf("%s: %s is ignored", fieldPath, installConfig.CPUPartitioning))`
	`397`	`+ }`
`393`	`398`	`}`
`394`	`399`
`395`	`400`	`// GetReplicaCount gets the configured master and worker replicas.`