Modified parent logic to not check size, but only changes in existence, and other review suggestions.

Author: vr4manta

config/v1/tests/infrastructures.config.openshift.io/VSphereMultiVCenterDay2.yaml

@@ -386,7 +386,7 @@ tests:
                   - network1
                   resourcePool: /DC1/host/cluster1/Resources
                 zone: zone1
-      expectedError: "vcenters must have at least 1 item"
+      expectedError: "spec.platformSpec.vsphere.vcenters in body should have at least 1 items"
     - name: Should be able to update existing vcenter details without changing vcenter count
       initial: |
         apiVersion: config.openshift.io/v1
@@ -720,7 +720,7 @@ tests:
                   - network1
                   resourcePool: /DC1/host/cluster1/Resources
                 zone: zone1
-      expectedError: "vcenters must have at least 1 item"
+      expectedError: "spec.platformSpec.vsphere.vcenters in body should have at least 1 items"
     - name: Should not be able to remove vcenters field entirely once set
       initial: |
         apiVersion: config.openshift.io/v1

config/v1/types_infrastructure.go

@@ -295,9 +295,8 @@ type ExternalPlatformSpec struct {
 // PlatformSpec holds the desired state specific to the underlying infrastructure provider
 // of the current cluster. Since these are used at spec-level for the underlying cluster, it
 // is supposed that only one of the spec structs is set.
-// +openshift:validation:FeatureGateAwareXValidation:featureGate="",rule="!has(oldSelf.vsphere) && has(self.vsphere) && has(self.vsphere.vcenters) ? size(self.vsphere.vcenters) < 2 : true",message="vcenters can have at most 1 item when configured post-install"
-// +openshift:validation:FeatureGateAwareXValidation:featureGate=VSphereMultiVCenterDay2,rule="has(oldSelf.vsphere) && has(oldSelf.vsphere.vcenters) ? (has(self.vsphere) && has(self.vsphere.vcenters) && size(self.vsphere.vcenters) > 0) : true",message="vcenters is required once set and must have at least 1 item"
-// +openshift:validation:FeatureGateAwareXValidation:featureGate=VSphereMultiVCenterDay2,rule="!has(oldSelf.vsphere) && has(self.vsphere) && has(self.vsphere.vcenters) ? size(self.vsphere.vcenters) > 0 : true",message="vcenters must have at least 1 item when initially configured"
+// +openshift:validation:FeatureGateAwareXValidation:featureGate="",rule="!has(oldSelf.vsphere) && has(self.vsphere) ? (has(self.vsphere.vcenters) && size(self.vsphere.vcenters) < 2) : true",message="vcenters can have at most 1 item when configured post-install"
+// +openshift:validation:FeatureGateAwareXValidation:featureGate=VSphereMultiVCenterDay2,rule="oldSelf.?vsphere.vcenters.hasValue() ? self.?vsphere.vcenters.hasValue() : true",message="vcenters is required once set and cannot be removed"
 type PlatformSpec struct {
 	// type is the underlying infrastructure provider for the cluster. This
 	// value controls whether infrastructure automation such as service load
@@ -1645,19 +1644,20 @@ type VSpherePlatformNodeNetworking struct {
 // +kubebuilder:validation:XValidation:rule="!has(oldSelf.ingressIPs) || has(self.ingressIPs)",message="ingressIPs list is required once set"
 type VSpherePlatformSpec struct {
 	// vcenters holds the connection details for services to communicate with vCenter.
-	// Currently, only a single vCenter is supported, but in tech preview 3 vCenters are supported.
+	// Currently, up to 3 vCenters are supported.
 	// Once the cluster has been installed, you are unable to change the current number of defined
-	// vCenters except in the case where the cluster has been upgraded from a version of OpenShift
-	// where the vsphere platform spec was not present.  You may make modifications to the existing
+	// vCenters except when 1.) the cluster has been upgraded from a version of OpenShift
+	// where the vsphere platform spec was not present or 2.) in TechPreview you are able to add and
+	// remove vCenters but may not remove all vCenters.  You may make modifications to the existing
 	// vCenters that are defined in the vcenters list in order to match with any added or modified
 	// failure domains.
 	// ---
 	// + If VCenters is not defined use the existing cloud-config configmap defined
 	// + in openshift-config.
-	// +kubebuilder:validation:MinItems=0
+	// +kubebuilder:validation:MinItems=1
 	// +kubebuilder:validation:MaxItems=3
 	// +openshift:validation:FeatureGateAwareXValidation:featureGate="",rule="size(self) != size(oldSelf) ? size(oldSelf) == 0 && size(self) < 2 : true",message="vcenters cannot be added or removed once set"
-	// +openshift:validation:FeatureGateAwareXValidation:featureGate=VSphereMultiVCenterDay2,rule="size(self) != size(oldSelf) ? size(self) > 0 : true",message="vcenters must have at least 1 item"
+	// +openshift:validation:FeatureGateAwareXValidation:featureGate=VSphereMultiVCenterDay2,rule="true",message=""
 	// +listType=atomic
 	// +optional
 	VCenters []VSpherePlatformVCenterSpec `json:"vcenters,omitempty"`

config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml

@@ -1031,10 +1031,11 @@ spec:
                       vcenters:
                         description: |-
                           vcenters holds the connection details for services to communicate with vCenter.
-                          Currently, only a single vCenter is supported, but in tech preview 3 vCenters are supported.
+                          Currently, up to 3 vCenters are supported.
                           Once the cluster has been installed, you are unable to change the current number of defined
-                          vCenters except in the case where the cluster has been upgraded from a version of OpenShift
-                          where the vsphere platform spec was not present.  You may make modifications to the existing
+                          vCenters except when 1.) the cluster has been upgraded from a version of OpenShift
+                          where the vsphere platform spec was not present or 2.) in TechPreview you are able to add and
+                          remove vCenters but may not remove all vCenters.  You may make modifications to the existing
                           vCenters that are defined in the vcenters list in order to match with any added or modified
                           failure domains.
                         items:
@@ -1079,12 +1080,11 @@ spec:
                           - server
                           type: object
                         maxItems: 3
-                        minItems: 0
+                        minItems: 1
                         type: array
                         x-kubernetes-list-type: atomic
                         x-kubernetes-validations:
-                        - message: vcenters must have at least 1 item
-                          rule: 'size(self) != size(oldSelf) ? size(self) > 0 : true'
+                        - rule: "true"
                     type: object
                     x-kubernetes-validations:
                     - message: apiServerInternalIPs list is required once set
@@ -1093,14 +1093,9 @@ spec:
                       rule: '!has(oldSelf.ingressIPs) || has(self.ingressIPs)'
                 type: object
                 x-kubernetes-validations:
-                - message: vcenters is required once set and must have at least 1
-                    item
-                  rule: 'has(oldSelf.vsphere) && has(oldSelf.vsphere.vcenters) ? (has(self.vsphere)
-                    && has(self.vsphere.vcenters) && size(self.vsphere.vcenters) >
-                    0) : true'
-                - message: vcenters must have at least 1 item when initially configured
-                  rule: '!has(oldSelf.vsphere) && has(self.vsphere) && has(self.vsphere.vcenters)
-                    ? size(self.vsphere.vcenters) > 0 : true'
+                - message: vcenters is required once set and cannot be removed
+                  rule: 'oldSelf.?vsphere.vcenters.hasValue() ? self.?vsphere.vcenters.hasValue()
+                    : true'
             type: object
           status:
             description: status holds observed values from the cluster. They may not

config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml

@@ -965,10 +965,11 @@ spec:
                       vcenters:
                         description: |-
                           vcenters holds the connection details for services to communicate with vCenter.
-                          Currently, only a single vCenter is supported, but in tech preview 3 vCenters are supported.
+                          Currently, up to 3 vCenters are supported.
                           Once the cluster has been installed, you are unable to change the current number of defined
-                          vCenters except in the case where the cluster has been upgraded from a version of OpenShift
-                          where the vsphere platform spec was not present.  You may make modifications to the existing
+                          vCenters except when 1.) the cluster has been upgraded from a version of OpenShift
+                          where the vsphere platform spec was not present or 2.) in TechPreview you are able to add and
+                          remove vCenters but may not remove all vCenters.  You may make modifications to the existing
                           vCenters that are defined in the vcenters list in order to match with any added or modified
                           failure domains.
                         items:
@@ -1013,7 +1014,7 @@ spec:
                           - server
                           type: object
                         maxItems: 3
-                        minItems: 0
+                        minItems: 1
                         type: array
                         x-kubernetes-list-type: atomic
                         x-kubernetes-validations:
@@ -1029,8 +1030,8 @@ spec:
                 type: object
                 x-kubernetes-validations:
                 - message: vcenters can have at most 1 item when configured post-install
-                  rule: '!has(oldSelf.vsphere) && has(self.vsphere) && has(self.vsphere.vcenters)
-                    ? size(self.vsphere.vcenters) < 2 : true'
+                  rule: '!has(oldSelf.vsphere) && has(self.vsphere) ? (has(self.vsphere.vcenters)
+                    && size(self.vsphere.vcenters) < 2) : true'
             type: object
           status:
             description: status holds observed values from the cluster. They may not

config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml

@@ -1031,10 +1031,11 @@ spec:
                       vcenters:
                         description: |-
                           vcenters holds the connection details for services to communicate with vCenter.
-                          Currently, only a single vCenter is supported, but in tech preview 3 vCenters are supported.
+                          Currently, up to 3 vCenters are supported.
                           Once the cluster has been installed, you are unable to change the current number of defined
-                          vCenters except in the case where the cluster has been upgraded from a version of OpenShift
-                          where the vsphere platform spec was not present.  You may make modifications to the existing
+                          vCenters except when 1.) the cluster has been upgraded from a version of OpenShift
+                          where the vsphere platform spec was not present or 2.) in TechPreview you are able to add and
+                          remove vCenters but may not remove all vCenters.  You may make modifications to the existing
                           vCenters that are defined in the vcenters list in order to match with any added or modified
                           failure domains.
                         items:
@@ -1079,12 +1080,11 @@ spec:
                           - server
                           type: object
                         maxItems: 3
-                        minItems: 0
+                        minItems: 1
                         type: array
                         x-kubernetes-list-type: atomic
                         x-kubernetes-validations:
-                        - message: vcenters must have at least 1 item
-                          rule: 'size(self) != size(oldSelf) ? size(self) > 0 : true'
+                        - rule: "true"
                     type: object
                     x-kubernetes-validations:
                     - message: apiServerInternalIPs list is required once set
@@ -1093,14 +1093,9 @@ spec:
                       rule: '!has(oldSelf.ingressIPs) || has(self.ingressIPs)'
                 type: object
                 x-kubernetes-validations:
-                - message: vcenters is required once set and must have at least 1
-                    item
-                  rule: 'has(oldSelf.vsphere) && has(oldSelf.vsphere.vcenters) ? (has(self.vsphere)
-                    && has(self.vsphere.vcenters) && size(self.vsphere.vcenters) >
-                    0) : true'
-                - message: vcenters must have at least 1 item when initially configured
-                  rule: '!has(oldSelf.vsphere) && has(self.vsphere) && has(self.vsphere.vcenters)
-                    ? size(self.vsphere.vcenters) > 0 : true'
+                - message: vcenters is required once set and cannot be removed
+                  rule: 'oldSelf.?vsphere.vcenters.hasValue() ? self.?vsphere.vcenters.hasValue()
+                    : true'
             type: object
           status:
             description: status holds observed values from the cluster. They may not

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

@@ -965,10 +965,11 @@ spec:
                       vcenters:
                         description: |-
                           vcenters holds the connection details for services to communicate with vCenter.
-                          Currently, only a single vCenter is supported, but in tech preview 3 vCenters are supported.
+                          Currently, up to 3 vCenters are supported.
                           Once the cluster has been installed, you are unable to change the current number of defined
-                          vCenters except in the case where the cluster has been upgraded from a version of OpenShift
-                          where the vsphere platform spec was not present.  You may make modifications to the existing
+                          vCenters except when 1.) the cluster has been upgraded from a version of OpenShift
+                          where the vsphere platform spec was not present or 2.) in TechPreview you are able to add and
+                          remove vCenters but may not remove all vCenters.  You may make modifications to the existing
                           vCenters that are defined in the vcenters list in order to match with any added or modified
                           failure domains.
                         items:
@@ -1013,7 +1014,7 @@ spec:
                           - server
                           type: object
                         maxItems: 3
-                        minItems: 0
+                        minItems: 1
                         type: array
                         x-kubernetes-list-type: atomic
                         x-kubernetes-validations:
@@ -1029,8 +1030,8 @@ spec:
                 type: object
                 x-kubernetes-validations:
                 - message: vcenters can have at most 1 item when configured post-install
-                  rule: '!has(oldSelf.vsphere) && has(self.vsphere) && has(self.vsphere.vcenters)
-                    ? size(self.vsphere.vcenters) < 2 : true'
+                  rule: '!has(oldSelf.vsphere) && has(self.vsphere) ? (has(self.vsphere.vcenters)
+                    && size(self.vsphere.vcenters) < 2) : true'
             type: object
           status:
             description: status holds observed values from the cluster. They may not

config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml

@@ -1031,10 +1031,11 @@ spec:
                       vcenters:
                         description: |-
                           vcenters holds the connection details for services to communicate with vCenter.
-                          Currently, only a single vCenter is supported, but in tech preview 3 vCenters are supported.
+                          Currently, up to 3 vCenters are supported.
                           Once the cluster has been installed, you are unable to change the current number of defined
-                          vCenters except in the case where the cluster has been upgraded from a version of OpenShift
-                          where the vsphere platform spec was not present.  You may make modifications to the existing
+                          vCenters except when 1.) the cluster has been upgraded from a version of OpenShift
+                          where the vsphere platform spec was not present or 2.) in TechPreview you are able to add and
+                          remove vCenters but may not remove all vCenters.  You may make modifications to the existing
                           vCenters that are defined in the vcenters list in order to match with any added or modified
                           failure domains.
                         items:
@@ -1079,7 +1080,7 @@ spec:
                           - server
                           type: object
                         maxItems: 3
-                        minItems: 0
+                        minItems: 1
                         type: array
                         x-kubernetes-list-type: atomic
                         x-kubernetes-validations:
@@ -1095,8 +1096,8 @@ spec:
                 type: object
                 x-kubernetes-validations:
                 - message: vcenters can have at most 1 item when configured post-install
-                  rule: '!has(oldSelf.vsphere) && has(self.vsphere) && has(self.vsphere.vcenters)
-                    ? size(self.vsphere.vcenters) < 2 : true'
+                  rule: '!has(oldSelf.vsphere) && has(self.vsphere) ? (has(self.vsphere.vcenters)
+                    && size(self.vsphere.vcenters) < 2) : true'
             type: object
           status:
             description: status holds observed values from the cluster. They may not

config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AAA_ungated.yaml

@@ -946,10 +946,11 @@ spec:
                       vcenters:
                         description: |-
                           vcenters holds the connection details for services to communicate with vCenter.
-                          Currently, only a single vCenter is supported, but in tech preview 3 vCenters are supported.
+                          Currently, up to 3 vCenters are supported.
                           Once the cluster has been installed, you are unable to change the current number of defined
-                          vCenters except in the case where the cluster has been upgraded from a version of OpenShift
-                          where the vsphere platform spec was not present.  You may make modifications to the existing
+                          vCenters except when 1.) the cluster has been upgraded from a version of OpenShift
+                          where the vsphere platform spec was not present or 2.) in TechPreview you are able to add and
+                          remove vCenters but may not remove all vCenters.  You may make modifications to the existing
                           vCenters that are defined in the vcenters list in order to match with any added or modified
                           failure domains.
                         items:
@@ -990,7 +991,7 @@ spec:
                           - server
                           type: object
                         maxItems: 3
-                        minItems: 0
+                        minItems: 1
                         type: array
                         x-kubernetes-list-type: atomic
                         x-kubernetes-validations:
@@ -1006,8 +1007,8 @@ spec:
                 type: object
                 x-kubernetes-validations:
                 - message: vcenters can have at most 1 item when configured post-install
-                  rule: '!has(oldSelf.vsphere) && has(self.vsphere) && has(self.vsphere.vcenters)
-                    ? size(self.vsphere.vcenters) < 2 : true'
+                  rule: '!has(oldSelf.vsphere) && has(self.vsphere) ? (has(self.vsphere.vcenters)
+                    && size(self.vsphere.vcenters) < 2) : true'
             type: object
           status:
             description: status holds observed values from the cluster. They may not