run go generate

pkg/operator/apis/aro.openshift.io/v1alpha1/zz_generated.deepcopy.go

@@ -94,7 +94,13 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
 		copy(*out, *in)
 	}
 	out.Banner = in.Banner
-	out.Features = in.Features
+	if in.OperatorFlags != nil {
+		in, out := &in.OperatorFlags, &out.OperatorFlags
+		*out = make(OperatorFlags, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterSpec.
@@ -134,21 +140,6 @@ func (in *ClusterStatus) DeepCopy() *ClusterStatus {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *FeaturesSpec) DeepCopyInto(out *FeaturesSpec) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FeaturesSpec.
-func (in *FeaturesSpec) DeepCopy() *FeaturesSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(FeaturesSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *GenevaLoggingSpec) DeepCopyInto(out *GenevaLoggingSpec) {
 	*out = *in
@@ -183,3 +174,24 @@ func (in *InternetCheckerSpec) DeepCopy() *InternetCheckerSpec {
 	in.DeepCopyInto(out)
 	return out
 }
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in OperatorFlags) DeepCopyInto(out *OperatorFlags) {
+	{
+		in := &in
+		*out = make(OperatorFlags, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OperatorFlags.
+func (in OperatorFlags) DeepCopy() OperatorFlags {
+	if in == nil {
+		return nil
+	}
+	out := new(OperatorFlags)
+	in.DeepCopyInto(out)
+	return *out
+}

pkg/operator/deploy/staticresources/aro.openshift.io_clusters.yaml

@@ -54,32 +54,6 @@ spec:
                 type: string
               domain:
                 type: string
-              features:
-                description: FeaturesSpec defines ARO operator feature gates
-                properties:
-                  reconcileAlertWebhook:
-                    type: boolean
-                  reconcileBanner:
-                    type: boolean
-                  reconcileDNSMasq:
-                    type: boolean
-                  reconcileGenevaLogging:
-                    type: boolean
-                  reconcileMachineSet:
-                    type: boolean
-                  reconcileMonitoringConfig:
-                    type: boolean
-                  reconcileNodeDrainer:
-                    type: boolean
-                  reconcilePullSecret:
-                    type: boolean
-                  reconcileRouteFix:
-                    type: boolean
-                  reconcileSubnets:
-                    type: boolean
-                  reconcileWorkaroundsController:
-                    type: boolean
-                type: object
               gatewayDomains:
                 items:
                   type: string
@@ -123,6 +97,11 @@ spec:
                 type: object
               location:
                 type: string
+              operatorflags:
+                additionalProperties:
+                  type: string
+                description: OperatorFlags defines feature gates for the ARO Operator
+                type: object
               resourceId:
                 description: ResourceID is the Azure resourceId of the cluster
                 type: string