Added validation to check if OKD has all default featuregates and rebased repo

Author: jatinsu

config/v1/types_feature.go

@@ -53,8 +53,8 @@ var (
 	// your cluster may fail in an unrecoverable way.
 	CustomNoUpgrade FeatureSet = "CustomNoUpgrade"
 
-	// OKD turns on features for OKD. Turning this feature set ON is supported for OKD clusters, but NOT for OpenShift clusters
-	// this feature set on CANNOT BE UNDONE for OKD clusters and when enabled on OpenShift clusters it PREVENTS UPGRADES.
+	// OKD turns on features for OKD. Turning this feature set ON is supported for OKD clusters, but NOT for OpenShift clusters.
+	// Once enabled, this feature set cannot be changed back to Default, but can be changed to other feature sets and it allows upgrades.
 	OKD FeatureSet = "OKD"
 
 	// AllFixedFeatureSets are the featuresets that have known featuregates.  Custom doesn't for instance.  LatencySensitive is dead
@@ -75,7 +75,7 @@ type FeatureGateSelection struct {
 	// +kubebuilder:validation:XValidation:rule="oldSelf == 'CustomNoUpgrade' ? self == 'CustomNoUpgrade' : true",message="CustomNoUpgrade may not be changed"
 	// +kubebuilder:validation:XValidation:rule="oldSelf == 'TechPreviewNoUpgrade' ? self == 'TechPreviewNoUpgrade' : true",message="TechPreviewNoUpgrade may not be changed"
 	// +kubebuilder:validation:XValidation:rule="oldSelf == 'DevPreviewNoUpgrade' ? self == 'DevPreviewNoUpgrade' : true",message="DevPreviewNoUpgrade may not be changed"
-	// +kubebuilder:validation:XValidation:rule="oldSelf == 'OKD' ? self == 'OKD' : true",message="OKD may not be changed"
+	// +kubebuilder:validation:XValidation:rule="oldSelf == 'OKD' ? self != '' : true",message="OKD cannot transition to Default"
 	FeatureSet FeatureSet `json:"featureSet,omitempty"`
 
 	// customNoUpgrade allows the enabling or disabling of any feature. Turning this feature set on IS NOT SUPPORTED, CANNOT BE UNDONE, and PREVENTS UPGRADES.

config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-OKD.crd.yaml

@@ -180,7 +180,7 @@ spec:
                         operator and you have verified the authenticity of the provided
                         image yourself.
                       The provided image will run with full administrative access
-                      to the cluster. Do not use this flag with images that comes from unknown
+                      to the cluster. Do not use this flag with images that come from unknown
                       or potentially malicious sources.
                     type: boolean
                   image:
@@ -273,6 +273,17 @@ spec:
                   description: Release represents an OpenShift release image and associated
                     metadata.
                   properties:
+                    architecture:
+                      description: |-
+                        architecture is an optional field that indicates the
+                        value of the cluster architecture. In this context cluster
+                        architecture means either a single architecture or a multi
+                        architecture.
+                        Valid values are 'Multi' and empty.
+                      enum:
+                      - Multi
+                      - ""
+                      type: string
                     channels:
                       description: |-
                         channels is the set of Cincinnati channels to which the release
@@ -448,6 +459,17 @@ spec:
                     release:
                       description: release is the target of the update.
                       properties:
+                        architecture:
+                          description: |-
+                            architecture is an optional field that indicates the
+                            value of the cluster architecture. In this context cluster
+                            architecture means either a single architecture or a multi
+                            architecture.
+                            Valid values are 'Multi' and empty.
+                          enum:
+                          - Multi
+                          - ""
+                          type: string
                         channels:
                           description: |-
                             channels is the set of Cincinnati channels to which the release
@@ -623,6 +645,17 @@ spec:
                   If the cluster is not yet fully initialized desired will be set
                   with the information available, which may be an image or a tag.
                 properties:
+                  architecture:
+                    description: |-
+                      architecture is an optional field that indicates the
+                      value of the cluster architecture. In this context cluster
+                      architecture means either a single architecture or a multi
+                      architecture.
+                      Valid values are 'Multi' and empty.
+                    enum:
+                    - Multi
+                    - ""
+                    type: string
                   channels:
                     description: |-
                       channels is the set of Cincinnati channels to which the release

config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_featuregates.crd.yaml

@@ -92,8 +92,8 @@ spec:
                 - message: DevPreviewNoUpgrade may not be changed
                   rule: 'oldSelf == ''DevPreviewNoUpgrade'' ? self == ''DevPreviewNoUpgrade''
                     : true'
-                - message: OKD may not be changed
-                  rule: 'oldSelf == ''OKD'' ? self == ''OKD'' : true'
+                - message: OKD cannot transition to Default
+                  rule: 'oldSelf == ''OKD'' ? self != '''' : true'
             type: object
             x-kubernetes-validations:
             - message: .spec.featureSet cannot be removed

config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_images-OKD.crd.yaml

@@ -4,7 +4,6 @@ metadata:
   annotations:
     api-approved.openshift.io: https://github.com/openshift/api/pull/470
     api.openshift.io/merged-by-featuregates: "true"
-    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     release.openshift.io/bootstrap-required: "true"
     release.openshift.io/feature-set: OKD

config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_schedulers-OKD.crd.yaml renamed to config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_schedulers-SelfManagedHA-OKD.crd.yaml

@@ -93,8 +93,8 @@ spec:
                 - message: DevPreviewNoUpgrade may not be changed
                   rule: 'oldSelf == ''DevPreviewNoUpgrade'' ? self == ''DevPreviewNoUpgrade''
                     : true'
-                - message: OKD may not be changed
-                  rule: 'oldSelf == ''OKD'' ? self == ''OKD'' : true'
+                - message: OKD cannot transition to Default
+                  rule: 'oldSelf == ''OKD'' ? self != '''' : true'
             type: object
             x-kubernetes-validations:
             - message: .spec.featureSet cannot be removed