Merge pull request #7825 from bfournie/warn-tech-preview

openshift-merge-bot[bot] · web-flow · commit c6c992295f82 · 2023-12-20T21:49:16.000Z
OCPBUGS-19054: Warn that FeatureSet is not supported
diff --git a/pkg/asset/agent/installconfig.go b/pkg/asset/agent/installconfig.go
@@ -80,6 +80,10 @@ func (a *OptionalInstallConfig) validateInstallConfig(installConfig *types.Insta
 		allErrs = append(allErrs, err...)
 	}
 
+	if installConfig.FeatureSet != configv1.Default {
+		allErrs = append(allErrs, field.NotSupported(field.NewPath("FeatureSet"), installConfig.FeatureSet, []string{string(configv1.Default)}))
+	}
+
 	warnUnusedConfig(installConfig)
 
 	numMasters, numWorkers := GetReplicaCount(installConfig)

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,10 @@ func (a OptionalInstallConfig) validateInstallConfig(installConfig types.Insta`
`80`	`80`	`allErrs = append(allErrs, err...)`
`81`	`81`	`}`
`82`	`82`
	`83`	`+ if installConfig.FeatureSet != configv1.Default {`
	`84`	`+ allErrs = append(allErrs, field.NotSupported(field.NewPath("FeatureSet"), installConfig.FeatureSet, []string{string(configv1.Default)}))`
	`85`	`+ }`
	`86`	`+`
`83`	`87`	`warnUnusedConfig(installConfig)`
`84`	`88`
`85`	`89`	`numMasters, numWorkers := GetReplicaCount(installConfig)`