Changed vcenter MaxItems to be 3 for TechPreview.

openshift · Apr 29, 2024 · cbbd567 · cbbd567
1 parent a8b3ba9
commit cbbd567
Show file tree

Hide file tree

Showing 41 changed files with 4,290 additions and 22 deletions.
diff --git a/config/v1/feature_gates.go b/config/v1/feature_gates.go
@@ -338,6 +338,13 @@ var (
 						enableIn(Default, DevPreviewNoUpgrade, TechPreviewNoUpgrade).
 						mustRegister()
 
+	FeatureGateVSphereMultiVCenters = newFeatureGate("VSphereMultiVCenters").
+					reportProblemsToJiraComponent("splat").
+					contactPerson("vr4manta").
+					productScope(ocpSpecific).
+					enableIn(DevPreviewNoUpgrade, TechPreviewNoUpgrade).
+					mustRegister()
+
 	FeatureGateVSphereStaticIPs = newFeatureGate("VSphereStaticIPs").
 					reportProblemsToJiraComponent("splat").
 					contactPerson("rvanderp3").

diff --git a/config/v1/types_infrastructure.go b/config/v1/types_infrastructure.go
@@ -1333,8 +1333,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
@@ -892,7 +892,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
@@ -892,7 +892,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
@@ -892,7 +892,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
@@ -864,7 +864,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
@@ -864,7 +864,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
@@ -864,7 +864,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
@@ -880,7 +880,6 @@ spec:
                           - datacenters
                           - server
                           type: object
-                        maxItems: 1
                         minItems: 0
                         type: array
                         x-kubernetes-list-type: atomic

diff --git a/....featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereMultiVCenters.yaml b/....featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereMultiVCenters.yaml
diff --git a/example/v1/types_stable.go b/example/v1/types_stable.go
@@ -67,6 +67,12 @@ type StableConfigTypeSpec struct {
 	// celUnion demonstrates how to validate a discrminated union using CEL
 	// +optional
 	CELUnion CELUnion `json:"celUnion,omitempty"`
+
+	// EvolvingCollection demonstrates how to have a collection where the maximum number of items varies on cluster type.
+	// For default clusters, this will be "1" but on TechPreview clusters, this value will be "3".
+	// +openshift:validation:FeatureGateAwareMaxItems:featureGate="",maxItems=1
+	// +openshift:validation:FeatureGateAwareMaxItems:featureGate=Example,maxItems=3
+	EvolvingCollection []string `json:"evolvingCollection,omitempty"`
 }
 
 type EvolvingUnion struct {

diff --git a/...generated.crd-manifests/0000_50_my-operator_01_stableconfigtypes-CustomNoUpgrade.crd.yaml b/...generated.crd-manifests/0000_50_my-operator_01_stableconfigtypes-CustomNoUpgrade.crd.yaml
@@ -71,6 +71,15 @@ spec:
                 description: coolNewField is a field that is for tech preview only.  On
                   normal clusters this shouldn't be present
                 type: string
+              evolvingCollection:
+                description: EvolvingCollection demonstrates how to have a collection
+                  where the maximum number of items varies on cluster type. For default
+                  clusters, this will be "1" but on TechPreview clusters, this value
+                  will be "3".
+                items:
+                  type: string
+                maxItems: 3
+                type: array
               evolvingUnion:
                 description: evolvingUnion demonstrates how to phase in new values
                   into discriminated union

diff --git a/...e/v1/zz_generated.crd-manifests/0000_50_my-operator_01_stableconfigtypes-Default.crd.yaml b/...e/v1/zz_generated.crd-manifests/0000_50_my-operator_01_stableconfigtypes-Default.crd.yaml
@@ -67,6 +67,15 @@ spec:
                 - message: optionalMember is forbidden when type is not OptionalMember
                   rule: 'has(self.type) && self.type == ''OptionalMember'' ?  true
                     : !has(self.optionalMember)'
+              evolvingCollection:
+                description: EvolvingCollection demonstrates how to have a collection
+                  where the maximum number of items varies on cluster type. For default
+                  clusters, this will be "1" but on TechPreview clusters, this value
+                  will be "3".
+                items:
+                  type: string
+                maxItems: 1
+                type: array
               evolvingUnion:
                 description: evolvingUnion demonstrates how to phase in new values
                   into discriminated union

diff --git a/...rated.crd-manifests/0000_50_my-operator_01_stableconfigtypes-DevPreviewNoUpgrade.crd.yaml b/...rated.crd-manifests/0000_50_my-operator_01_stableconfigtypes-DevPreviewNoUpgrade.crd.yaml
@@ -71,6 +71,15 @@ spec:
                 description: coolNewField is a field that is for tech preview only.  On
                   normal clusters this shouldn't be present
                 type: string
+              evolvingCollection:
+                description: EvolvingCollection demonstrates how to have a collection
+                  where the maximum number of items varies on cluster type. For default
+                  clusters, this will be "1" but on TechPreview clusters, this value
+                  will be "3".
+                items:
+                  type: string
+                maxItems: 3
+                type: array
               evolvingUnion:
                 description: evolvingUnion demonstrates how to phase in new values
                   into discriminated union

diff --git a/...ated.crd-manifests/0000_50_my-operator_01_stableconfigtypes-TechPreviewNoUpgrade.crd.yaml b/...ated.crd-manifests/0000_50_my-operator_01_stableconfigtypes-TechPreviewNoUpgrade.crd.yaml
@@ -71,6 +71,15 @@ spec:
                 description: coolNewField is a field that is for tech preview only.  On
                   normal clusters this shouldn't be present
                 type: string
+              evolvingCollection:
+                description: EvolvingCollection demonstrates how to have a collection
+                  where the maximum number of items varies on cluster type. For default
+                  clusters, this will be "1" but on TechPreview clusters, this value
+                  will be "3".
+                items:
+                  type: string
+                maxItems: 3
+                type: array
               evolvingUnion:
                 description: evolvingUnion demonstrates how to phase in new values
                   into discriminated union

diff --git a/...erated.featuregated-crd-manifests/stableconfigtypes.example.openshift.io/AAA_ungated.yaml b/...erated.featuregated-crd-manifests/stableconfigtypes.example.openshift.io/AAA_ungated.yaml
@@ -67,6 +67,15 @@ spec:
                 - message: optionalMember is forbidden when type is not OptionalMember
                   rule: 'has(self.type) && self.type == ''OptionalMember'' ?  true
                     : !has(self.optionalMember)'
+              evolvingCollection:
+                description: EvolvingCollection demonstrates how to have a collection
+                  where the maximum number of items varies on cluster type. For default
+                  clusters, this will be "1" but on TechPreview clusters, this value
+                  will be "3".
+                items:
+                  type: string
+                maxItems: 1
+                type: array
               evolvingUnion:
                 description: evolvingUnion demonstrates how to phase in new values
                   into discriminated union

diff --git a/..._generated.featuregated-crd-manifests/stableconfigtypes.example.openshift.io/Example.yaml b/..._generated.featuregated-crd-manifests/stableconfigtypes.example.openshift.io/Example.yaml
@@ -71,6 +71,15 @@ spec:
                 description: coolNewField is a field that is for tech preview only.  On
                   normal clusters this shouldn't be present
                 type: string
+              evolvingCollection:
+                description: EvolvingCollection demonstrates how to have a collection
+                  where the maximum number of items varies on cluster type. For default
+                  clusters, this will be "1" but on TechPreview clusters, this value
+                  will be "3".
+                items:
+                  type: string
+                maxItems: 3
+                type: array
               evolvingUnion:
                 description: evolvingUnion demonstrates how to phase in new values
                   into discriminated union

diff --git a/features.md b/features.md
@@ -41,6 +41,7 @@
 | TranslateStreamCloseWebsocketRequests| | | <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>  |
 | UpgradeStatus| | | <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>  |
+| 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>  |
 | 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>  |
 | 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>  |

diff --git a/...erated.crd-manifests/0000_80_machine-config_01_controllerconfigs-CustomNoUpgrade.crd.yaml b/...erated.crd-manifests/0000_80_machine-config_01_controllerconfigs-CustomNoUpgrade.crd.yaml
@@ -1185,7 +1185,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_80_machine-config_01_controllerconfigs-DevPreviewNoUpgrade.crd.yaml b/...ed.crd-manifests/0000_80_machine-config_01_controllerconfigs-DevPreviewNoUpgrade.crd.yaml
@@ -1185,7 +1185,7 @@ spec:
                                   - datacenters
                                   - server
                                   type: object
-                                maxItems: 1
+                                maxItems: 3
                                 minItems: 0
                                 type: array
                                 x-kubernetes-list-type: atomic

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

diff --git a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests.yaml b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests.yaml
@@ -32,6 +32,7 @@ controllerconfigs.machineconfiguration.openshift.io:
   - GCPClusterHostedDNS
   - GCPLabelsTags
   - VSphereControlPlaneMachineSet
+  - VSphereMultiVCenters
   FilenameOperatorName: machine-config
   FilenameOperatorOrdering: "01"
   FilenameRunLevel: "0000_80"

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

diff --git a/...rd-manifests/controllerconfigs.machineconfiguration.openshift.io/GCPClusterHostedDNS.yaml b/...rd-manifests/controllerconfigs.machineconfiguration.openshift.io/GCPClusterHostedDNS.yaml
@@ -1168,7 +1168,6 @@ spec:
                                   - datacenters
                                   - server
                                   type: object
-                                maxItems: 1
                                 minItems: 0
                                 type: array
                                 x-kubernetes-list-type: atomic

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

diff --git a/...ts/controllerconfigs.machineconfiguration.openshift.io/VSphereControlPlaneMachineSet.yaml b/...ts/controllerconfigs.machineconfiguration.openshift.io/VSphereControlPlaneMachineSet.yaml
@@ -1185,7 +1185,6 @@ spec:
                                   - datacenters
                                   - server
                                   type: object
-                                maxItems: 1
                                 minItems: 0
                                 type: array
                                 x-kubernetes-list-type: atomic