make generate

swghosh · swghosh · commit d68b6cedf93f · 2024-09-26T17:54:01.000+05:30
Signed-off-by: Swarup Ghosh &lt;swghosh@redhat.com&gt;
diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_apiservers.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_apiservers.crd.yaml
@@ -160,11 +160,6 @@ spec:
                       of sensitive resources can and will change over time.  The current
                       authoritative list is: \n 1. secrets 2. configmaps 3. routes.route.openshift.io
                       4. oauthaccesstokens.oauth.openshift.io 5. oauthauthorizetokens.oauth.openshift.io"
-                    enum:
-                    - ""
-                    - identity
-                    - aescbc
-                    - aesgcm
                     type: string
                 type: object
               servingCerts:
diff --git a/config/v1/zz_generated.featuregated-crd-manifests/apiservers.config.openshift.io/AAA_ungated.yaml b/config/v1/zz_generated.featuregated-crd-manifests/apiservers.config.openshift.io/AAA_ungated.yaml
@@ -161,11 +161,6 @@ spec:
                       of sensitive resources can and will change over time.  The current
                       authoritative list is: \n 1. secrets 2. configmaps 3. routes.route.openshift.io
                       4. oauthaccesstokens.oauth.openshift.io 5. oauthauthorizetokens.oauth.openshift.io"
-                    enum:
-                    - ""
-                    - identity
-                    - aescbc
-                    - aesgcm
                     type: string
                 type: object
               servingCerts:
diff --git a/features.md b/features.md
@@ -22,6 +22,7 @@
 | InsightsConfigAPI| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | InsightsOnDemandDataGather| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | InsightsRuntimeExtractor| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
+| KMSv2| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | MachineAPIProviderOpenStack| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | MachineConfigNodes| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | ManagedBootImagesAWS| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
@@ -63,7 +64,6 @@
 | HardwareSpeed| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | IngressControllerLBSubnetsAWS| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | KMSv1| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
-| KMSv2| <span style="background-color: #519450">Enabled</span> |  | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | ManagedBootImages| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | MetricsServer| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | MultiArchInstallAWS| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
diff --git a/payload-manifests/crds/0000_10_config-operator_01_apiservers.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_apiservers.crd.yaml
@@ -160,11 +160,6 @@ spec:
                       of sensitive resources can and will change over time.  The current
                       authoritative list is: \n 1. secrets 2. configmaps 3. routes.route.openshift.io
                       4. oauthaccesstokens.oauth.openshift.io 5. oauthauthorizetokens.oauth.openshift.io"
-                    enum:
-                    - ""
-                    - identity
-                    - aescbc
-                    - aesgcm
                     type: string
                 type: object
               servingCerts:
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -70,6 +70,9 @@
                     {
                         "name": "InsightsRuntimeExtractor"
                     },
+                    {
+                        "name": "KMSv2"
+                    },
                     {
                         "name": "MachineAPIMigration"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -125,6 +125,9 @@
                     {
                         "name": "KMSv1"
                     },
+                    {
+                        "name": "KMSv2"
+                    },
                     {
                         "name": "MachineAPIProviderOpenStack"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -125,6 +125,9 @@
                     {
                         "name": "KMSv1"
                     },
+                    {
+                        "name": "KMSv2"
+                    },
                     {
                         "name": "MachineAPIProviderOpenStack"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -73,6 +73,9 @@
                     {
                         "name": "InsightsRuntimeExtractor"
                     },
+                    {
+                        "name": "KMSv2"
+                    },
                     {
                         "name": "MachineAPIMigration"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -125,6 +125,9 @@
                     {
                         "name": "KMSv1"
                     },
+                    {
+                        "name": "KMSv2"
+                    },
                     {
                         "name": "MachineAPIProviderOpenStack"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -125,6 +125,9 @@
                     {
                         "name": "KMSv1"
                     },
+                    {
+                        "name": "KMSv2"
+                    },
                     {
                         "name": "MachineAPIProviderOpenStack"
                     },

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,9 @@`
`70`	`70`	`{`
`71`	`71`	`"name": "InsightsRuntimeExtractor"`
`72`	`72`	`},`
	`73`	`+ {`
	`74`	`+ "name": "KMSv2"`
	`75`	`+ },`
`73`	`76`	`{`
`74`	`77`	`"name": "MachineAPIMigration"`
`75`	`78`	`},`
Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,9 @@`
`125`	`125`	`{`
`126`	`126`	`"name": "KMSv1"`
`127`	`127`	`},`
	`128`	`+ {`
	`129`	`+ "name": "KMSv2"`
	`130`	`+ },`
`128`	`131`	`{`
`129`	`132`	`"name": "MachineAPIProviderOpenStack"`
`130`	`133`	`},`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,9 @@`
`73`	`73`	`{`
`74`	`74`	`"name": "InsightsRuntimeExtractor"`
`75`	`75`	`},`
	`76`	`+ {`
	`77`	`+ "name": "KMSv2"`
	`78`	`+ },`
`76`	`79`	`{`
`77`	`80`	`"name": "MachineAPIMigration"`
`78`	`81`	`},`