Merge pull request #2204 from rvanderp3/SPLAT-2044

openshift-merge-bot[bot] · web-flow · commit f5e205b58365 · 2025-05-27T07:28:45.000Z
SPLAT-2044 - [vsphere] promote multi-nic to default
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
@@ -718,7 +718,7 @@ spec:
                                     /<datacenter>/network/<portgroup>.
                                   items:
                                     type: string
-                                  maxItems: 1
+                                  maxItems: 10
                                   minItems: 1
                                   type: array
                                   x-kubernetes-list-type: atomic
diff --git a/features.md b/features.md
@@ -58,7 +58,6 @@
 | 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>  |
 | 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>  |
-| 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>  |
 | VolumeAttributesClass| | | <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>  |
@@ -94,4 +93,5 @@
 | SetEIPForNLBIngressController| <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>  |
 | 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>  |
+| 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>  |
 | 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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
diff --git a/features/features.go b/features/features.go
@@ -666,7 +666,7 @@ var (
 					contactPerson("rvanderp").
 					productScope(ocpSpecific).
 					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 					mustRegister()
 
 	FeatureGateIngressControllerDynamicConfigurationManager = newFeatureGate("IngressControllerDynamicConfigurationManager").
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
@@ -1001,7 +1001,7 @@ spec:
                                             /<datacenter>/network/<portgroup>.
                                           items:
                                             type: string
-                                          maxItems: 1
+                                          maxItems: 10
                                           minItems: 1
                                           type: array
                                           x-kubernetes-list-type: atomic
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
@@ -718,7 +718,7 @@ spec:
                                     /<datacenter>/network/<portgroup>.
                                   items:
                                     type: string
-                                  maxItems: 1
+                                  maxItems: 10
                                   minItems: 1
                                   type: array
                                   x-kubernetes-list-type: atomic
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
@@ -1001,7 +1001,7 @@ spec:
                                             /<datacenter>/network/<portgroup>.
                                           items:
                                             type: string
-                                          maxItems: 1
+                                          maxItems: 10
                                           minItems: 1
                                           type: array
                                           x-kubernetes-list-type: atomic
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -187,9 +187,6 @@
                     {
                         "name": "VSphereMultiDisk"
                     },
-                    {
-                        "name": "VSphereMultiNetworks"
-                    },
                     {
                         "name": "VolumeAttributesClass"
                     },
@@ -297,6 +294,9 @@
                     {
                         "name": "UserNamespacesSupport"
                     },
+                    {
+                        "name": "VSphereMultiNetworks"
+                    },
                     {
                         "name": "ValidatingAdmissionPolicy"
                     }
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -187,9 +187,6 @@
                     {
                         "name": "VSphereMultiDisk"
                     },
-                    {
-                        "name": "VSphereMultiNetworks"
-                    },
                     {
                         "name": "VolumeAttributesClass"
                     },
@@ -297,6 +294,9 @@
                     {
                         "name": "UserNamespacesSupport"
                     },
+                    {
+                        "name": "VSphereMultiNetworks"
+                    },
                     {
                         "name": "ValidatingAdmissionPolicy"
                     }

Original file line number	Diff line number	Diff line change
`@@ -187,9 +187,6 @@`
`187`	`187`	`{`
`188`	`188`	`"name": "VSphereMultiDisk"`
`189`	`189`	`},`
`190`		`- {`
`191`		`- "name": "VSphereMultiNetworks"`
`192`		`- },`
`193`	`190`	`{`
`194`	`191`	`"name": "VolumeAttributesClass"`
`195`	`192`	`},`
`@@ -297,6 +294,9 @@`
`297`	`294`	`{`
`298`	`295`	`"name": "UserNamespacesSupport"`
`299`	`296`	`},`
	`297`	`+ {`
	`298`	`+ "name": "VSphereMultiNetworks"`
	`299`	`+ },`
`300`	`300`	`{`
`301`	`301`	`"name": "ValidatingAdmissionPolicy"`
`302`	`302`	`}`