Merge pull request #1842 from vr4manta/SPLAT-1452

SPLAT-1452: Changed vcenter MaxItems to be 3 for TechPreview.
openshift · May 8, 2024 · 95e2292 · 95e2292
2 parents 62b890e + 3a0f16f
commit 95e2292
Show file tree

Hide file tree

Showing 49 changed files with 4,755 additions and 23 deletions.
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,6 +1,7 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "Infrastructure"
 crdName: infrastructures.config.openshift.io
+featureGate: -VSphereMultiVCenters
 tests:
   onCreate:
     - name: Should be able to create a minimal Infrastructure
@@ -182,6 +183,40 @@ 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/tests/infrastructures.config.openshift.io/VSphereMultiVCenters.yaml b/config/v1/tests/infrastructures.config.openshift.io/VSphereMultiVCenters.yaml
@@ -0,0 +1,141 @@
+apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
+name: "Infrastructure"
+crdName: infrastructures.config.openshift.io
+featureGate: VSphereMultiVCenters
+tests:
+  onCreate:
+    - name: Should be able to create a minimal Infrastructure
+      initial: |
+        apiVersion: config.openshift.io/v1
+        kind: Infrastructure
+        spec: {} # No spec is required for a Infrastructure
+      expected: |
+        apiVersion: config.openshift.io/v1
+        kind: Infrastructure
+        spec: {}
+    - name: Should be able to pass more than 1 entries to vcenters in the vsphere platform spec
+      initial: |
+        apiVersion: config.openshift.io/v1
+        kind: Infrastructure
+        spec:
+          cloudConfig:
+            key: config
+            name: cloud-provider-config
+          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
+      expected: |
+        apiVersion: config.openshift.io/v1
+        kind: Infrastructure
+        spec:
+          cloudConfig:
+            key: config
+            name: cloud-provider-config
+          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
+  onUpdate:
+    - name: Should be able to set vCenters to multiple
+      initial: |
+        apiVersion: config.openshift.io/v1
+        kind: Infrastructure
+        spec:
+          cloudConfig:
+            key: config
+            name: cloud-provider-config
+          platformSpec:
+            type: VSphere
+            vsphere:
+              vcenters:
+                - datacenters:
+                    - IBMCloud
+                  port: 443
+                  server: vcs8e-vc.ocp2.dev.cluster.com
+      updated: |
+        apiVersion: config.openshift.io/v1
+        kind: Infrastructure
+        spec:
+          cloudConfig:
+            key: config
+            name: cloud-provider-config
+          platformSpec:
+            type: VSphere
+            vsphere:
+              vcenters:
+                - datacenters:
+                    - IBMCloud
+                  port: 443
+                  server: vcs8e-vc.ocp2.dev.cluster.com
+                - datacenters:
+                    - IBMCloud
+                  port: 443
+                  server: v8c-2-vcenter.ocp2.dev.cluster.com
+      expected: |
+        apiVersion: config.openshift.io/v1
+        kind: Infrastructure
+        spec:
+          cloudConfig:
+            key: config
+            name: cloud-provider-config
+          platformSpec:
+            type: VSphere
+            vsphere:
+              vcenters:
+                - datacenters:
+                    - IBMCloud
+                  port: 443
+                  server: vcs8e-vc.ocp2.dev.cluster.com
+                - datacenters:
+                    - IBMCloud
+                  port: 443
+                  server: v8c-2-vcenter.ocp2.dev.cluster.com
diff --git a/config/v1/types_infrastructure.go b/config/v1/types_infrastructure.go
@@ -1343,8 +1343,9 @@ type VSpherePlatformSpec struct {
 	// ---
 	// + If VCenters is not defined use the existing cloud-config configmap defined
 	// + in openshift-config.
-	// +kubebuilder:validation:MaxItems=1
 	// +kubebuilder:validation:MinItems=0
+	// +openshift:validation:FeatureGateAwareMaxItems:featureGate="",maxItems=1
+	// +openshift:validation:FeatureGateAwareMaxItems:featureGate=VSphereMultiVCenters,maxItems=3
 	// +listType=atomic
 	// +optional
 	VCenters []VSpherePlatformVCenterSpec `json:"vcenters,omitempty"`

diff --git a/...nerated.crd-manifests/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml b/...nerated.crd-manifests/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml
@@ -898,7 +898,7 @@ spec:
                           - datacenters
                           - server
                           type: object
-                        maxItems: 1
+                        maxItems: 3
                         minItems: 0
                         type: array
                         x-kubernetes-list-type: atomic

diff --git a/...ted.crd-manifests/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml b/...ted.crd-manifests/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml
@@ -898,7 +898,7 @@ spec:
                           - datacenters
                           - server
                           type: object
-                        maxItems: 1
+                        maxItems: 3
                         minItems: 0
                         type: array
                         x-kubernetes-list-type: atomic

diff --git a/...ed.crd-manifests/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml b/...ed.crd-manifests/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml
@@ -898,7 +898,7 @@ spec:
                           - datacenters
                           - server
                           type: object
-                        maxItems: 1
+                        maxItems: 3
                         minItems: 0
                         type: array
                         x-kubernetes-list-type: atomic

diff --git a/config/v1/zz_generated.featuregated-crd-manifests.yaml b/config/v1/zz_generated.featuregated-crd-manifests.yaml
@@ -303,6 +303,7 @@ infrastructures.config.openshift.io:
   - GCPClusterHostedDNS
   - GCPLabelsTags
   - VSphereControlPlaneMachineSet
+  - VSphereMultiVCenters
   FilenameOperatorName: config-operator
   FilenameOperatorOrdering: "01"
   FilenameRunLevel: "0000_10"

diff --git a/...featuregated-crd-manifests/infrastructures.config.openshift.io/BareMetalLoadBalancer.yaml b/...featuregated-crd-manifests/infrastructures.config.openshift.io/BareMetalLoadBalancer.yaml
@@ -870,7 +870,6 @@ spec:
                           - datacenters
                           - server
                           type: object
-                        maxItems: 1
                         minItems: 0
                         type: array
                         x-kubernetes-list-type: atomic

diff --git a/...d.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPClusterHostedDNS.yaml b/...d.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPClusterHostedDNS.yaml
@@ -870,7 +870,6 @@ spec:
                           - datacenters
                           - server
                           type: object
-                        maxItems: 1
                         minItems: 0
                         type: array
                         x-kubernetes-list-type: atomic

diff --git a/...nerated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPLabelsTags.yaml b/...nerated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPLabelsTags.yaml
@@ -870,7 +870,6 @@ spec:
                           - datacenters
                           - server
                           type: object
-                        maxItems: 1
                         minItems: 0
                         type: array
                         x-kubernetes-list-type: atomic

diff --git a/...ated-crd-manifests/infrastructures.config.openshift.io/VSphereControlPlaneMachineSet.yaml b/...ated-crd-manifests/infrastructures.config.openshift.io/VSphereControlPlaneMachineSet.yaml
@@ -886,7 +886,6 @@ spec:
                           - datacenters
                           - server
                           type: object
-                        maxItems: 1
                         minItems: 0
                         type: array
                         x-kubernetes-list-type: atomic