Merge pull request #2063 from vr4manta/SPLAT-1851

openshift-merge-bot[bot] · web-flow · commit a09992e80c68 · 2024-11-24T01:05:41.000Z
SPLAT-1851: Make VSphereMultiVCenters feature gate GA
diff --git a/config/v1/tests/infrastructures.config.openshift.io/AAA_ungated.yaml b/config/v1/tests/infrastructures.config.openshift.io/AAA_ungated.yaml
@@ -1,8 +1,6 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "Infrastructure"
 crdName: infrastructures.config.openshift.io
-featureGates:
-- -VSphereMultiVCenters
 tests:
   onCreate:
     - name: Should be able to create a minimal Infrastructure
@@ -184,40 +182,6 @@ tests:
               machineNetworks:
                 - 192.0.2.1
       expectedError: "spec.platformSpec.baremetal.machineNetworks[0]: Invalid value: \"string\": value must be a valid CIDR network address"
-    - name: Should not be able to pass more than 1 entries to vcenters in the vsphere platform spec
-      initial: |
-        apiVersion: config.openshift.io/v1
-        kind: Infrastructure
-        spec:
-          platformSpec:
-            type: VSphere
-            vsphere:
-              failureDomains:
-              - name: generated-failure-domain
-                region: generated-region
-                server: server1.dev.cluster.com
-                topology:
-                  computeCluster: /IBMCloud/host/vcs-8e-workload
-                  datacenter: IBMCloud
-                  datastore: /IBMCloud/datastore/mdcnc-ds-shared
-                  networks:
-                    - ocp-ci-seg-13
-                  resourcePool: /IBMCloud/host/vcs-8e-workload/Resources
-                  template: /IBMCloud/vm/ngirard-dev-rqh5s-rhcos-generated-region-generated-zone
-                zone: generated-zone            
-              nodeNetworking:
-                external: {}
-                internal: {}
-              vcenters:
-              - datacenters:
-                - IBMCloud
-                port: 443
-                server: server1.dev.cluster.com
-              - datacenters:
-                - IBMCloud2
-                port: 443
-                server: server2.dev.cluster.com
-      expectedError: "Too many: 2: must have at most 1 items"
   onUpdate:
     - name: Should be able to change External platformName from unknown to something else
       initial: |
diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml
@@ -920,7 +920,7 @@ spec:
                           - datacenters
                           - server
                           type: object
-                        maxItems: 1
+                        maxItems: 3
                         minItems: 0
                         type: array
                         x-kubernetes-list-type: atomic
diff --git a/features.md b/features.md
@@ -51,7 +51,6 @@
 | UserNamespacesPodSecurityStandards| | | <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>  |
 | UserNamespacesSupport| | | <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>  |
 | VSphereMultiNetworks| | | <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>  |
-| VSphereMultiVCenters| | | <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>  |
 | VolumeAttributesClass| | | <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>  |
 | VolumeGroupSnapshot| | | <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>  |
 | ExternalOIDC| <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>  |
@@ -80,5 +79,6 @@
 | SetEIPForNLBIngressController| <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>  |
 | VSphereControlPlaneMachineSet| <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>  |
 | VSphereDriverConfiguration| <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>  |
+| VSphereMultiVCenters| <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>  |
 | VSphereStaticIPs| <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>  |
 | ValidatingAdmissionPolicy| <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/features/features.go b/features/features.go
@@ -208,7 +208,7 @@ var (
 					contactPerson("vr4manta").
 					productScope(ocpSpecific).
 					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 					mustRegister()
 
 	FeatureGateVSphereStaticIPs = newFeatureGate("VSphereStaticIPs").
diff --git a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml
@@ -1197,7 +1197,7 @@ spec:
                                   - datacenters
                                   - server
                                   type: object
-                                maxItems: 1
+                                maxItems: 3
                                 minItems: 0
                                 type: array
                                 x-kubernetes-list-type: atomic
diff --git a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-Default.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-Default.crd.yaml
@@ -920,7 +920,7 @@ spec:
                           - datacenters
                           - server
                           type: object
-                        maxItems: 1
+                        maxItems: 3
                         minItems: 0
                         type: array
                         x-kubernetes-list-type: atomic
diff --git a/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml b/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml
@@ -1197,7 +1197,7 @@ spec:
                                   - datacenters
                                   - server
                                   type: object
-                                maxItems: 1
+                                maxItems: 3
                                 minItems: 0
                                 type: array
                                 x-kubernetes-list-type: atomic
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -166,9 +166,6 @@
                     {
                         "name": "VSphereMultiNetworks"
                     },
-                    {
-                        "name": "VSphereMultiVCenters"
-                    },
                     {
                         "name": "VolumeAttributesClass"
                     },
@@ -255,6 +252,9 @@
                     {
                         "name": "VSphereDriverConfiguration"
                     },
+                    {
+                        "name": "VSphereMultiVCenters"
+                    },
                     {
                         "name": "VSphereStaticIPs"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -166,9 +166,6 @@
                     {
                         "name": "VSphereMultiNetworks"
                     },
-                    {
-                        "name": "VSphereMultiVCenters"
-                    },
                     {
                         "name": "VolumeAttributesClass"
                     },
@@ -255,6 +252,9 @@
                     {
                         "name": "VSphereDriverConfiguration"
                     },
+                    {
+                        "name": "VSphereMultiVCenters"
+                    },
                     {
                         "name": "VSphereStaticIPs"
                     },

Original file line number	Diff line number	Diff line change
`@@ -166,9 +166,6 @@`
`166`	`166`	`{`
`167`	`167`	`"name": "VSphereMultiNetworks"`
`168`	`168`	`},`
`169`		`- {`
`170`		`- "name": "VSphereMultiVCenters"`
`171`		`- },`
`172`	`169`	`{`
`173`	`170`	`"name": "VolumeAttributesClass"`
`174`	`171`	`},`
`@@ -255,6 +252,9 @@`
`255`	`252`	`{`
`256`	`253`	`"name": "VSphereDriverConfiguration"`
`257`	`254`	`},`
	`255`	`+ {`
	`256`	`+ "name": "VSphereMultiVCenters"`
	`257`	`+ },`
`258`	`258`	`{`
`259`	`259`	`"name": "VSphereStaticIPs"`
`260`	`260`	`},`