Merge pull request #2326 from vr4manta/SPLAT-2213

openshift-merge-bot[bot] · web-flow · commit 768a119763c4 · 2025-05-19T20:43:49.000Z
SPLAT-2213: Added vSphere mixed node env feature gate
diff --git a/features.md b/features.md
@@ -15,6 +15,7 @@
 | SELinuxChangePolicy| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
 | SELinuxMount| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
 | SigstoreImageVerificationPKI| | | <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> | |  |
 | NewOLM| | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span>  |
 | AWSClusterHostedDNS| | | <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>  |
 | AWSDedicatedHosts| | | <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
@@ -822,4 +822,12 @@ var (
 					enhancementPR("https://github.com/openshift/enhancements/pull/1781").
 					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 					mustRegister()
+
+	FeatureGateVSphereMixedNodeEnv = newFeatureGate("VSphereMixedNodeEnv").
+					reportProblemsToJiraComponent("splat").
+					contactPerson("vr4manta").
+					productScope(ocpSpecific).
+					enhancementPR("https://github.com/openshift/enhancements/pull/1772").
+					enableIn(configv1.DevPreviewNoUpgrade).
+					mustRegister()
 )
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -184,6 +184,9 @@
                     {
                         "name": "VSphereHostVMGroupZonal"
                     },
+                    {
+                        "name": "VSphereMixedNodeEnv"
+                    },
                     {
                         "name": "VSphereMultiDisk"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -293,6 +293,9 @@
                     {
                         "name": "VSphereHostVMGroupZonal"
                     },
+                    {
+                        "name": "VSphereMixedNodeEnv"
+                    },
                     {
                         "name": "VSphereMultiDisk"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -62,6 +62,9 @@
                     },
                     {
                         "name": "SigstoreImageVerificationPKI"
+                    },
+                    {
+                        "name": "VSphereMixedNodeEnv"
                     }
                 ],
                 "enabled": [
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -184,6 +184,9 @@
                     {
                         "name": "VSphereHostVMGroupZonal"
                     },
+                    {
+                        "name": "VSphereMixedNodeEnv"
+                    },
                     {
                         "name": "VSphereMultiDisk"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -293,6 +293,9 @@
                     {
                         "name": "VSphereHostVMGroupZonal"
                     },
+                    {
+                        "name": "VSphereMixedNodeEnv"
+                    },
                     {
                         "name": "VSphereMultiDisk"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -47,6 +47,9 @@
                     },
                     {
                         "name": "SigstoreImageVerificationPKI"
+                    },
+                    {
+                        "name": "VSphereMixedNodeEnv"
                     }
                 ],
                 "enabled": [

Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,9 @@`
`184`	`184`	`{`
`185`	`185`	`"name": "VSphereHostVMGroupZonal"`
`186`	`186`	`},`
	`187`	`+ {`
	`188`	`+ "name": "VSphereMixedNodeEnv"`
	`189`	`+ },`
`187`	`190`	`{`
`188`	`191`	`"name": "VSphereMultiDisk"`
`189`	`192`	`},`
Original file line number	Diff line number	Diff line change
`@@ -293,6 +293,9 @@`
`293`	`293`	`{`
`294`	`294`	`"name": "VSphereHostVMGroupZonal"`
`295`	`295`	`},`
	`296`	`+ {`
	`297`	`+ "name": "VSphereMixedNodeEnv"`
	`298`	`+ },`
`296`	`299`	`{`
`297`	`300`	`"name": "VSphereMultiDisk"`
`298`	`301`	`},`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,9 @@`
`62`	`62`	`},`
`63`	`63`	`{`
`64`	`64`	`"name": "SigstoreImageVerificationPKI"`
	`65`	`+ },`
	`66`	`+ {`
	`67`	`+ "name": "VSphereMixedNodeEnv"`
`65`	`68`	`}`
`66`	`69`	`],`
`67`	`70`	`"enabled": [`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,9 @@`
`47`	`47`	`},`
`48`	`48`	`{`
`49`	`49`	`"name": "SigstoreImageVerificationPKI"`
	`50`	`+ },`
	`51`	`+ {`
	`52`	`+ "name": "VSphereMixedNodeEnv"`
`50`	`53`	`}`
`51`	`54`	`],`
`52`	`55`	`"enabled": [`