Changed vcenter MaxItems to be 3 for TechPreview.

openshift · Apr 22, 2024 · e26c54f · e26c54f
1 parent a8b3ba9
commit e26c54f
Show file tree

Hide file tree

Showing 22 changed files with 4,144 additions and 12 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(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=VSphereMultiVCenters,featureGateEnabled=false,maxItems=1
+	// +openshift:validation:FeatureGateAwareMaxItems:featureGate=VSphereMultiVCenters,featureGateEnabled=true,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/...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/VSphereMultiVCenters.yaml b/....featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereMultiVCenters.yaml
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>  |
 | 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/...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"