DNM proof of a gate differing 4 vs 5

Author: JoelSpeed

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

@@ -6,6 +6,7 @@ metadata:
     api.openshift.io/merged-by-featuregates: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     release.openshift.io/feature-set: Default
+    release.openshift.io/major-version: 5,6,7,8,9,10
   name: clusterversions.config.openshift.io
 spec:
   group: config.openshift.io

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

@@ -6,6 +6,7 @@ metadata:
     api.openshift.io/merged-by-featuregates: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     release.openshift.io/feature-set: OKD
+    release.openshift.io/major-version: 5,6,7,8,9,10
   name: clusterversions.config.openshift.io
 spec:
   group: config.openshift.io

…ator_01_clusterversions-Default.crd.yaml …01_clusterversions-5-10-Default.crd.yamlconfig/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-Default.crd.yaml renamed to config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-5-10-Default.crd.yaml config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-Default.crd.yaml renamed to config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-5-10-Default.crd.yaml

@@ -686,6 +686,7 @@ var (
 						productScope(ocpSpecific).
 						enhancementPR("https://github.com/openshift/enhancements/pull/1807").
 						enable(inDevPreviewNoUpgrade(), inTechPreviewNoUpgrade()).
+						enable(inVersion(4, equal), inDevPreviewNoUpgrade(), inTechPreviewNoUpgrade(), inDefault(), inOKD()).
 						mustRegister()
 
 	FeatureGateGCPCustomAPIEndpoints = newFeatureGate("GCPCustomAPIEndpoints").

…operator_01_clusterversions-OKD.crd.yaml …tor_01_clusterversions-5-10-OKD.crd.yamlconfig/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-OKD.crd.yaml renamed to config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-5-10-OKD.crd.yaml config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-OKD.crd.yaml renamed to config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-5-10-OKD.crd.yaml

@@ -4,7 +4,7 @@
     "metadata": {
         "annotations": {
             "include.release.openshift.io/ibm-cloud-managed": "false-except-for-the-config-operator",
-            "release.openshift.io/major-version": "4,5,6,7,8,9,10"
+            "release.openshift.io/major-version": "4"
         },
         "name": "cluster"
     },
@@ -85,9 +85,6 @@
                     {
                         "name": "ClusterMonitoringConfig"
                     },
-                    {
-                        "name": "ClusterUpdateAcceptRisks"
-                    },
                     {
                         "name": "ClusterVersionOperatorConfiguration"
                     },
@@ -258,6 +255,9 @@
                     {
                         "name": "CPMSMachineNamePrefix"
                     },
+                    {
+                        "name": "ClusterUpdateAcceptRisks"
+                    },
                     {
                         "name": "ConsolePluginContentSecurityPolicy"
                     },

features/features.go

@@ -4,7 +4,7 @@
     "metadata": {
         "annotations": {
             "include.release.openshift.io/ibm-cloud-managed": "false-except-for-the-config-operator",
-            "release.openshift.io/major-version": "4,5,6,7,8,9,10"
+            "release.openshift.io/major-version": "4"
         },
         "name": "cluster"
     },
@@ -87,9 +87,6 @@
                     {
                         "name": "ClusterMonitoringConfig"
                     },
-                    {
-                        "name": "ClusterUpdateAcceptRisks"
-                    },
                     {
                         "name": "ClusterVersionOperatorConfiguration"
                     },
@@ -260,6 +257,9 @@
                     {
                         "name": "CPMSMachineNamePrefix"
                     },
+                    {
+                        "name": "ClusterUpdateAcceptRisks"
+                    },
                     {
                         "name": "ConsolePluginContentSecurityPolicy"
                     },

…featureGate-4-10-Hypershift-Default.yaml …es/featureGate-4-Hypershift-Default.yamlpayload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml renamed to payload-manifests/featuregates/featureGate-4-Hypershift-Default.yaml payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml renamed to payload-manifests/featuregates/featureGate-4-Hypershift-Default.yaml

@@ -4,7 +4,7 @@
     "metadata": {
         "annotations": {
             "include.release.openshift.io/self-managed-high-availability": "false-except-for-the-config-operator",
-            "release.openshift.io/major-version": "4,5,6,7,8,9,10"
+            "release.openshift.io/major-version": "4"
         },
         "name": "cluster"
     },
@@ -85,9 +85,6 @@
                     {
                         "name": "ClusterMonitoringConfig"
                     },
-                    {
-                        "name": "ClusterUpdateAcceptRisks"
-                    },
                     {
                         "name": "ClusterVersionOperatorConfiguration"
                     },
@@ -252,6 +249,9 @@
                     {
                         "name": "CPMSMachineNamePrefix"
                     },
+                    {
+                        "name": "ClusterUpdateAcceptRisks"
+                    },
                     {
                         "name": "ConsolePluginContentSecurityPolicy"
                     },

…tes/featureGate-4-10-Hypershift-OKD.yaml …egates/featureGate-4-Hypershift-OKD.yamlpayload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml renamed to payload-manifests/featuregates/featureGate-4-Hypershift-OKD.yaml payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml renamed to payload-manifests/featuregates/featureGate-4-Hypershift-OKD.yaml

@@ -4,7 +4,7 @@
     "metadata": {
         "annotations": {
             "include.release.openshift.io/self-managed-high-availability": "false-except-for-the-config-operator",
-            "release.openshift.io/major-version": "4,5,6,7,8,9,10"
+            "release.openshift.io/major-version": "4"
         },
         "name": "cluster"
     },
@@ -87,9 +87,6 @@
                     {
                         "name": "ClusterMonitoringConfig"
                     },
-                    {
-                        "name": "ClusterUpdateAcceptRisks"
-                    },
                     {
                         "name": "ClusterVersionOperatorConfiguration"
                     },
@@ -254,6 +251,9 @@
                     {
                         "name": "CPMSMachineNamePrefix"
                     },
+                    {
+                        "name": "ClusterUpdateAcceptRisks"
+                    },
                     {
                         "name": "ConsolePluginContentSecurityPolicy"
                     },