vsphere vm-host zonal ga

jcpowermac · jcpowermac · commit 3757b1d4c6b8 · 2026-02-27T07:34:42.000-05:00
This commit is to add the vSphere vm-host zonal feature to default (GA).
diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml
@@ -828,6 +828,17 @@ spec:
                           - topology
                           - zone
                           type: object
+                          x-kubernetes-validations:
+                          - message: when zoneAffinity type is HostGroup, regionAffinity
+                              type must be ComputeCluster
+                            rule: 'has(self.zoneAffinity) && self.zoneAffinity.type
+                              == ''HostGroup'' ?  has(self.regionAffinity) && self.regionAffinity.type
+                              == ''ComputeCluster'' : true'
+                          - message: when zoneAffinity type is ComputeCluster, regionAffinity
+                              type must be Datacenter
+                            rule: 'has(self.zoneAffinity) && self.zoneAffinity.type
+                              == ''ComputeCluster'' ?  has(self.regionAffinity) &&
+                              self.regionAffinity.type == ''Datacenter'' : true'
                         type: array
                         x-kubernetes-list-map-keys:
                         - name
diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-OKD.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-OKD.crd.yaml
@@ -828,6 +828,17 @@ spec:
                           - topology
                           - zone
                           type: object
+                          x-kubernetes-validations:
+                          - message: when zoneAffinity type is HostGroup, regionAffinity
+                              type must be ComputeCluster
+                            rule: 'has(self.zoneAffinity) && self.zoneAffinity.type
+                              == ''HostGroup'' ?  has(self.regionAffinity) && self.regionAffinity.type
+                              == ''ComputeCluster'' : true'
+                          - message: when zoneAffinity type is ComputeCluster, regionAffinity
+                              type must be Datacenter
+                            rule: 'has(self.zoneAffinity) && self.zoneAffinity.type
+                              == ''ComputeCluster'' ?  has(self.regionAffinity) &&
+                              self.regionAffinity.type == ''Datacenter'' : true'
                         type: array
                         x-kubernetes-list-map-keys:
                         - name
diff --git a/features.md b/features.md
@@ -75,7 +75,6 @@
 | SELinuxMount| | | <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>  |
 | SignatureStores| | | <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>  |
 | VSphereConfigurableMaxAllowedBlockVolumesPerNode| | | <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>  |
-| VSphereHostVMGroupZonal| | | <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>  |
 | VSphereMixedNodeEnv| | | <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>  |
 | AzureWorkloadIdentity| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
@@ -110,5 +109,6 @@
 | 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> | <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>  |
 | UserNamespacesPodSecurityStandards| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | UserNamespacesSupport| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
+| VSphereHostVMGroupZonal| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | VSphereMultiDisk| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | VSphereMultiNetworks| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
diff --git a/features/features.go b/features/features.go
@@ -183,7 +183,7 @@ var (
 						contactPerson("jcpowermac").
 						productScope(ocpSpecific).
 						enhancementPR("https://github.com/openshift/enhancements/pull/1677").
-						enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
+						enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
 						mustRegister()
 
 	FeatureGateVSphereMultiDisk = newFeatureGate("VSphereMultiDisk").
diff --git a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml
@@ -1111,6 +1111,19 @@ spec:
                                   - topology
                                   - zone
                                   type: object
+                                  x-kubernetes-validations:
+                                  - message: when zoneAffinity type is HostGroup,
+                                      regionAffinity type must be ComputeCluster
+                                    rule: 'has(self.zoneAffinity) && self.zoneAffinity.type
+                                      == ''HostGroup'' ?  has(self.regionAffinity)
+                                      && self.regionAffinity.type == ''ComputeCluster''
+                                      : true'
+                                  - message: when zoneAffinity type is ComputeCluster,
+                                      regionAffinity type must be Datacenter
+                                    rule: 'has(self.zoneAffinity) && self.zoneAffinity.type
+                                      == ''ComputeCluster'' ?  has(self.regionAffinity)
+                                      && self.regionAffinity.type == ''Datacenter''
+                                      : true'
                                 type: array
                                 x-kubernetes-list-map-keys:
                                 - name
diff --git a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-OKD.crd.yaml b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-OKD.crd.yaml
@@ -1111,6 +1111,19 @@ spec:
                                   - topology
                                   - zone
                                   type: object
+                                  x-kubernetes-validations:
+                                  - message: when zoneAffinity type is HostGroup,
+                                      regionAffinity type must be ComputeCluster
+                                    rule: 'has(self.zoneAffinity) && self.zoneAffinity.type
+                                      == ''HostGroup'' ?  has(self.regionAffinity)
+                                      && self.regionAffinity.type == ''ComputeCluster''
+                                      : true'
+                                  - message: when zoneAffinity type is ComputeCluster,
+                                      regionAffinity type must be Datacenter
+                                    rule: 'has(self.zoneAffinity) && self.zoneAffinity.type
+                                      == ''ComputeCluster'' ?  has(self.regionAffinity)
+                                      && self.regionAffinity.type == ''Datacenter''
+                                      : true'
                                 type: array
                                 x-kubernetes-list-map-keys:
                                 - name
diff --git a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-Default.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-Default.crd.yaml
@@ -828,6 +828,17 @@ spec:
                           - topology
                           - zone
                           type: object
+                          x-kubernetes-validations:
+                          - message: when zoneAffinity type is HostGroup, regionAffinity
+                              type must be ComputeCluster
+                            rule: 'has(self.zoneAffinity) && self.zoneAffinity.type
+                              == ''HostGroup'' ?  has(self.regionAffinity) && self.regionAffinity.type
+                              == ''ComputeCluster'' : true'
+                          - message: when zoneAffinity type is ComputeCluster, regionAffinity
+                              type must be Datacenter
+                            rule: 'has(self.zoneAffinity) && self.zoneAffinity.type
+                              == ''ComputeCluster'' ?  has(self.regionAffinity) &&
+                              self.regionAffinity.type == ''Datacenter'' : true'
                         type: array
                         x-kubernetes-list-map-keys:
                         - name
diff --git a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-OKD.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-OKD.crd.yaml
@@ -828,6 +828,17 @@ spec:
                           - topology
                           - zone
                           type: object
+                          x-kubernetes-validations:
+                          - message: when zoneAffinity type is HostGroup, regionAffinity
+                              type must be ComputeCluster
+                            rule: 'has(self.zoneAffinity) && self.zoneAffinity.type
+                              == ''HostGroup'' ?  has(self.regionAffinity) && self.regionAffinity.type
+                              == ''ComputeCluster'' : true'
+                          - message: when zoneAffinity type is ComputeCluster, regionAffinity
+                              type must be Datacenter
+                            rule: 'has(self.zoneAffinity) && self.zoneAffinity.type
+                              == ''ComputeCluster'' ?  has(self.regionAffinity) &&
+                              self.regionAffinity.type == ''Datacenter'' : true'
                         type: array
                         x-kubernetes-list-map-keys:
                         - name
diff --git a/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml b/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml
@@ -1111,6 +1111,19 @@ spec:
                                   - topology
                                   - zone
                                   type: object
+                                  x-kubernetes-validations:
+                                  - message: when zoneAffinity type is HostGroup,
+                                      regionAffinity type must be ComputeCluster
+                                    rule: 'has(self.zoneAffinity) && self.zoneAffinity.type
+                                      == ''HostGroup'' ?  has(self.regionAffinity)
+                                      && self.regionAffinity.type == ''ComputeCluster''
+                                      : true'
+                                  - message: when zoneAffinity type is ComputeCluster,
+                                      regionAffinity type must be Datacenter
+                                    rule: 'has(self.zoneAffinity) && self.zoneAffinity.type
+                                      == ''ComputeCluster'' ?  has(self.regionAffinity)
+                                      && self.regionAffinity.type == ''Datacenter''
+                                      : true'
                                 type: array
                                 x-kubernetes-list-map-keys:
                                 - name
diff --git a/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-OKD.crd.yaml b/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-OKD.crd.yaml
@@ -1111,6 +1111,19 @@ spec:
                                   - topology
                                   - zone
                                   type: object
+                                  x-kubernetes-validations:
+                                  - message: when zoneAffinity type is HostGroup,
+                                      regionAffinity type must be ComputeCluster
+                                    rule: 'has(self.zoneAffinity) && self.zoneAffinity.type
+                                      == ''HostGroup'' ?  has(self.regionAffinity)
+                                      && self.regionAffinity.type == ''ComputeCluster''
+                                      : true'
+                                  - message: when zoneAffinity type is ComputeCluster,
+                                      regionAffinity type must be Datacenter
+                                    rule: 'has(self.zoneAffinity) && self.zoneAffinity.type
+                                      == ''ComputeCluster'' ?  has(self.regionAffinity)
+                                      && self.regionAffinity.type == ''Datacenter''
+                                      : true'
                                 type: array
                                 x-kubernetes-list-map-keys:
                                 - name
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
@@ -236,9 +236,6 @@
                     {
                         "name": "VSphereConfigurableMaxAllowedBlockVolumesPerNode"
                     },
-                    {
-                        "name": "VSphereHostVMGroupZonal"
-                    },
                     {
                         "name": "VSphereMixedNodeEnv"
                     },
@@ -346,6 +343,9 @@
                     {
                         "name": "UserNamespacesSupport"
                     },
+                    {
+                        "name": "VSphereHostVMGroupZonal"
+                    },
                     {
                         "name": "VSphereMultiDisk"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
@@ -238,9 +238,6 @@
                     {
                         "name": "VSphereConfigurableMaxAllowedBlockVolumesPerNode"
                     },
-                    {
-                        "name": "VSphereHostVMGroupZonal"
-                    },
                     {
                         "name": "VSphereMixedNodeEnv"
                     },
@@ -348,6 +345,9 @@
                     {
                         "name": "UserNamespacesSupport"
                     },
+                    {
+                        "name": "VSphereHostVMGroupZonal"
+                    },
                     {
                         "name": "VSphereMultiDisk"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
@@ -230,9 +230,6 @@
                     {
                         "name": "VSphereConfigurableMaxAllowedBlockVolumesPerNode"
                     },
-                    {
-                        "name": "VSphereHostVMGroupZonal"
-                    },
                     {
                         "name": "VSphereMixedNodeEnv"
                     },
@@ -346,6 +343,9 @@
                     {
                         "name": "UserNamespacesSupport"
                     },
+                    {
+                        "name": "VSphereHostVMGroupZonal"
+                    },
                     {
                         "name": "VSphereMultiDisk"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
@@ -232,9 +232,6 @@
                     {
                         "name": "VSphereConfigurableMaxAllowedBlockVolumesPerNode"
                     },
-                    {
-                        "name": "VSphereHostVMGroupZonal"
-                    },
                     {
                         "name": "VSphereMixedNodeEnv"
                     },
@@ -348,6 +345,9 @@
                     {
                         "name": "UserNamespacesSupport"
                     },
+                    {
+                        "name": "VSphereHostVMGroupZonal"
+                    },
                     {
                         "name": "VSphereMultiDisk"
                     },
