NO-JIRA: UPSTREAM: <carry>: featureset validation moved to CEL

openshift-kube-apiserver/admission/customresourcevalidation/features/validate_features.go

@@ -5,8 +5,6 @@ import (
 	"fmt"
 	"io"
 
-	"k8s.io/apimachinery/pkg/util/sets"
-
 	"k8s.io/apimachinery/pkg/api/validation"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -52,52 +50,13 @@ func toFeatureGateV1(uncastObj runtime.Object) (*configv1.FeatureGate, field.Err
 type featureGateV1 struct {
 }
 
-var knownFeatureSets = sets.NewString(
-	"",
-	string(configv1.TechPreviewNoUpgrade),
-	string(configv1.CustomNoUpgrade),
-	string(configv1.LatencySensitive),
-)
-
-func validateFeatureGateSpecCreate(spec configv1.FeatureGateSpec) field.ErrorList {
-	allErrs := field.ErrorList{}
-
-	// on create, we only allow values that we are aware of
-	if !knownFeatureSets.Has(string(spec.FeatureSet)) {
-		allErrs = append(allErrs, field.NotSupported(field.NewPath("spec.featureSet"), spec.FeatureSet, knownFeatureSets.List()))
-	}
-
-	return allErrs
-}
-
-func validateFeatureGateSpecUpdate(spec, oldSpec configv1.FeatureGateSpec) field.ErrorList {
-	allErrs := field.ErrorList{}
-
-	// on update, we don't fail validation on a field we don't recognize as long as it is not changing
-	if !knownFeatureSets.Has(string(spec.FeatureSet)) && oldSpec.FeatureSet != spec.FeatureSet {
-		allErrs = append(allErrs, field.NotSupported(field.NewPath("spec.featureSet"), spec.FeatureSet, knownFeatureSets.List()))
-	}
-
-	// we do not allow anyone to take back TechPreview
-	if oldSpec.FeatureSet == configv1.TechPreviewNoUpgrade && spec.FeatureSet != configv1.TechPreviewNoUpgrade {
-		allErrs = append(allErrs, field.Forbidden(field.NewPath("spec.featureSet"), "once enabled, tech preview features may not be disabled"))
-	}
-	// we do not allow anyone to take back CustomNoUpgrade
-	if oldSpec.FeatureSet == configv1.CustomNoUpgrade && spec.FeatureSet != configv1.CustomNoUpgrade {
-		allErrs = append(allErrs, field.Forbidden(field.NewPath("spec.featureSet"), "once enabled, custom feature gates may not be disabled"))
-	}
-
-	return allErrs
-}
-
 func (featureGateV1) ValidateCreate(_ context.Context, uncastObj runtime.Object) field.ErrorList {
 	obj, allErrs := toFeatureGateV1(uncastObj)
 	if len(allErrs) > 0 {
 		return allErrs
 	}
 
 	allErrs = append(allErrs, validation.ValidateObjectMeta(&obj.ObjectMeta, false, customresourcevalidation.RequireNameCluster, field.NewPath("metadata"))...)
-	allErrs = append(allErrs, validateFeatureGateSpecCreate(obj.Spec)...)
 
 	return allErrs
 }
@@ -113,7 +72,6 @@ func (featureGateV1) ValidateUpdate(_ context.Context, uncastObj runtime.Object,
 	}
 
 	allErrs = append(allErrs, validation.ValidateObjectMetaUpdate(&obj.ObjectMeta, &oldObj.ObjectMeta, field.NewPath("metadata"))...)
-	allErrs = append(allErrs, validateFeatureGateSpecUpdate(obj.Spec, oldObj.Spec)...)
 
 	return allErrs
 }