Added vSphere Day 2 logic to CRDs

Author: vr4manta

config/v1/types_infrastructure.go

@@ -295,7 +295,9 @@ 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.
-// +kubebuilder:validation:XValidation:rule="!has(oldSelf.vsphere) && has(self.vsphere) ? size(self.vsphere.vcenters) < 2 : true",message="vcenters can have at most 1 item when configured post-install"
+// +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"
 type PlatformSpec struct {
 	// type is the underlying infrastructure provider for the cluster. This
 	// value controls whether infrastructure automation such as service load
@@ -1641,7 +1643,9 @@ type VSpherePlatformNodeNetworking struct {
 // use these fields for configuration.
 // +kubebuilder:validation:XValidation:rule="!has(oldSelf.apiServerInternalIPs) || has(self.apiServerInternalIPs)",message="apiServerInternalIPs list is required once set"
 // +kubebuilder:validation:XValidation:rule="!has(oldSelf.ingressIPs) || has(self.ingressIPs)",message="ingressIPs list is required once set"
-// +kubebuilder:validation:XValidation:rule="!has(oldSelf.vcenters) && has(self.vcenters) ? size(self.vcenters) < 2 : true",message="vcenters can have at most 1 item when configured post-install"
+// +openshift:validation:FeatureGateAwareXValidation:featureGate="",rule="!has(oldSelf.vcenters) && has(self.vcenters) ? size(self.vcenters) < 2 : true",message="vcenters can have at most 1 item when configured post-install"
+// +openshift:validation:FeatureGateAwareXValidation:featureGate=VSphereMultiVCenterDay2,rule="!has(oldSelf.vcenters) || has(self.vcenters)",message="vcenters is required once set"
+// +openshift:validation:FeatureGateAwareXValidation:featureGate=VSphereMultiVCenterDay2,rule="has(self.vcenters) ? size(self.vcenters) > 0 : true",message="vcenters must have at least 1 item"
 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.
@@ -1655,7 +1659,8 @@ type VSpherePlatformSpec struct {
 	// + in openshift-config.
 	// +kubebuilder:validation:MinItems=0
 	// +kubebuilder:validation:MaxItems=3
-	// +kubebuilder:validation:XValidation: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="",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"
 	// +listType=atomic
 	// +optional
 	VCenters []VSpherePlatformVCenterSpec `json:"vcenters,omitempty"`

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

@@ -1083,23 +1083,28 @@ spec:
                         type: array
                         x-kubernetes-list-type: atomic
                         x-kubernetes-validations:
-                        - message: vcenters cannot be added or removed once set
-                          rule: 'size(self) != size(oldSelf) ? size(oldSelf) == 0
-                            && size(self) < 2 : true'
+                        - message: vcenters must have at least 1 item
+                          rule: 'size(self) != size(oldSelf) ? size(self) > 0 : true'
                     type: object
                     x-kubernetes-validations:
+                    - message: vcenters is required once set
+                      rule: '!has(oldSelf.vcenters) || has(self.vcenters)'
+                    - message: vcenters must have at least 1 item
+                      rule: 'has(self.vcenters) ? size(self.vcenters) > 0 : true'
                     - message: apiServerInternalIPs list is required once set
                       rule: '!has(oldSelf.apiServerInternalIPs) || has(self.apiServerInternalIPs)'
                     - message: ingressIPs list is required once set
                       rule: '!has(oldSelf.ingressIPs) || has(self.ingressIPs)'
-                    - message: vcenters can have at most 1 item when configured post-install
-                      rule: '!has(oldSelf.vcenters) && has(self.vcenters) ? size(self.vcenters)
-                        < 2 : true'
                 type: object
                 x-kubernetes-validations:
-                - message: vcenters can have at most 1 item when configured post-install
-                  rule: '!has(oldSelf.vsphere) && has(self.vsphere) ? size(self.vsphere.vcenters)
-                    < 2 : true'
+                - 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'
             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

@@ -1026,14 +1026,11 @@ spec:
                       rule: '!has(oldSelf.apiServerInternalIPs) || has(self.apiServerInternalIPs)'
                     - message: ingressIPs list is required once set
                       rule: '!has(oldSelf.ingressIPs) || has(self.ingressIPs)'
-                    - message: vcenters can have at most 1 item when configured post-install
-                      rule: '!has(oldSelf.vcenters) && has(self.vcenters) ? size(self.vcenters)
-                        < 2 : true'
                 type: object
                 x-kubernetes-validations:
                 - message: vcenters can have at most 1 item when configured post-install
-                  rule: '!has(oldSelf.vsphere) && has(self.vsphere) ? 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

@@ -1083,23 +1083,28 @@ spec:
                         type: array
                         x-kubernetes-list-type: atomic
                         x-kubernetes-validations:
-                        - message: vcenters cannot be added or removed once set
-                          rule: 'size(self) != size(oldSelf) ? size(oldSelf) == 0
-                            && size(self) < 2 : true'
+                        - message: vcenters must have at least 1 item
+                          rule: 'size(self) != size(oldSelf) ? size(self) > 0 : true'
                     type: object
                     x-kubernetes-validations:
+                    - message: vcenters is required once set
+                      rule: '!has(oldSelf.vcenters) || has(self.vcenters)'
+                    - message: vcenters must have at least 1 item
+                      rule: 'has(self.vcenters) ? size(self.vcenters) > 0 : true'
                     - message: apiServerInternalIPs list is required once set
                       rule: '!has(oldSelf.apiServerInternalIPs) || has(self.apiServerInternalIPs)'
                     - message: ingressIPs list is required once set
                       rule: '!has(oldSelf.ingressIPs) || has(self.ingressIPs)'
-                    - message: vcenters can have at most 1 item when configured post-install
-                      rule: '!has(oldSelf.vcenters) && has(self.vcenters) ? size(self.vcenters)
-                        < 2 : true'
                 type: object
                 x-kubernetes-validations:
-                - message: vcenters can have at most 1 item when configured post-install
-                  rule: '!has(oldSelf.vsphere) && has(self.vsphere) ? size(self.vsphere.vcenters)
-                    < 2 : true'
+                - 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'
             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

@@ -1026,14 +1026,11 @@ spec:
                       rule: '!has(oldSelf.apiServerInternalIPs) || has(self.apiServerInternalIPs)'
                     - message: ingressIPs list is required once set
                       rule: '!has(oldSelf.ingressIPs) || has(self.ingressIPs)'
-                    - message: vcenters can have at most 1 item when configured post-install
-                      rule: '!has(oldSelf.vcenters) && has(self.vcenters) ? size(self.vcenters)
-                        < 2 : true'
                 type: object
                 x-kubernetes-validations:
                 - message: vcenters can have at most 1 item when configured post-install
-                  rule: '!has(oldSelf.vsphere) && has(self.vsphere) ? 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

@@ -1092,14 +1092,11 @@ spec:
                       rule: '!has(oldSelf.apiServerInternalIPs) || has(self.apiServerInternalIPs)'
                     - message: ingressIPs list is required once set
                       rule: '!has(oldSelf.ingressIPs) || has(self.ingressIPs)'
-                    - message: vcenters can have at most 1 item when configured post-install
-                      rule: '!has(oldSelf.vcenters) && has(self.vcenters) ? size(self.vcenters)
-                        < 2 : true'
                 type: object
                 x-kubernetes-validations:
                 - message: vcenters can have at most 1 item when configured post-install
-                  rule: '!has(oldSelf.vsphere) && has(self.vsphere) ? 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.yaml

@@ -377,6 +377,7 @@ infrastructures.config.openshift.io:
   - OnPremDNSRecords
   - VSphereHostVMGroupZonal
   - VSphereMultiNetworks
+  - VSphereMultiVCenterDay2
   FilenameOperatorName: config-operator
   FilenameOperatorOrdering: "01"
   FilenameRunLevel: "0000_10"

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

@@ -999,18 +999,18 @@ spec:
                             && size(self) < 2 : true'
                     type: object
                     x-kubernetes-validations:
+                    - message: vcenters can have at most 1 item when configured post-install
+                      rule: '!has(oldSelf.vcenters) && has(self.vcenters) ? size(self.vcenters)
+                        < 2 : true'
                     - message: apiServerInternalIPs list is required once set
                       rule: '!has(oldSelf.apiServerInternalIPs) || has(self.apiServerInternalIPs)'
                     - message: ingressIPs list is required once set
                       rule: '!has(oldSelf.ingressIPs) || has(self.ingressIPs)'
-                    - message: vcenters can have at most 1 item when configured post-install
-                      rule: '!has(oldSelf.vcenters) && has(self.vcenters) ? size(self.vcenters)
-                        < 2 : true'
                 type: object
                 x-kubernetes-validations:
                 - message: vcenters can have at most 1 item when configured post-install
-                  rule: '!has(oldSelf.vsphere) && has(self.vsphere) ? 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/AWSClusterHostedDNSInstall.yaml

@@ -991,24 +991,13 @@ spec:
                         minItems: 0
                         type: array
                         x-kubernetes-list-type: atomic
-                        x-kubernetes-validations:
-                        - message: vcenters cannot be added or removed once set
-                          rule: 'size(self) != size(oldSelf) ? size(oldSelf) == 0
-                            && size(self) < 2 : true'
                     type: object
                     x-kubernetes-validations:
                     - message: apiServerInternalIPs list is required once set
                       rule: '!has(oldSelf.apiServerInternalIPs) || has(self.apiServerInternalIPs)'
                     - message: ingressIPs list is required once set
                       rule: '!has(oldSelf.ingressIPs) || has(self.ingressIPs)'
-                    - message: vcenters can have at most 1 item when configured post-install
-                      rule: '!has(oldSelf.vcenters) && has(self.vcenters) ? size(self.vcenters)
-                        < 2 : true'
                 type: object
-                x-kubernetes-validations:
-                - message: vcenters can have at most 1 item when configured post-install
-                  rule: '!has(oldSelf.vsphere) && has(self.vsphere) ? 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/AWSDualStackInstall.yaml

@@ -991,24 +991,13 @@ spec:
                         minItems: 0
                         type: array
                         x-kubernetes-list-type: atomic
-                        x-kubernetes-validations:
-                        - message: vcenters cannot be added or removed once set
-                          rule: 'size(self) != size(oldSelf) ? size(oldSelf) == 0
-                            && size(self) < 2 : true'
                     type: object
                     x-kubernetes-validations:
                     - message: apiServerInternalIPs list is required once set
                       rule: '!has(oldSelf.apiServerInternalIPs) || has(self.apiServerInternalIPs)'
                     - message: ingressIPs list is required once set
                       rule: '!has(oldSelf.ingressIPs) || has(self.ingressIPs)'
-                    - message: vcenters can have at most 1 item when configured post-install
-                      rule: '!has(oldSelf.vcenters) && has(self.vcenters) ? size(self.vcenters)
-                        < 2 : true'
                 type: object
-                x-kubernetes-validations:
-                - message: vcenters can have at most 1 item when configured post-install
-                  rule: '!has(oldSelf.vsphere) && has(self.vsphere) ? size(self.vsphere.vcenters)
-                    < 2 : true'
             type: object
           status:
             description: status holds observed values from the cluster. They may not