Merge pull request #2529 from djoshy/promo-vsphere-boot-images

openshift-merge-bot[bot] · web-flow · commit 3856d779060d · 2025-10-19T00:25:37.000Z
MCO-1861: Promote ManagedBootImagesvSphere feature gate to default
diff --git a/features.md b/features.md
@@ -53,7 +53,6 @@
 | KMSEncryptionProvider| | | <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>  |
 | MachineAPIMigration| | | <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>  |
 | ManagedBootImagesCPMS| | | <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>  |
-| ManagedBootImagesvSphere| | | <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>  |
 | MaxUnavailableStatefulSet| | | <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>  |
 | MinimumKubeletVersion| | | <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>  |
 | MixedCPUsAllocation| | | <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>  |
@@ -88,6 +87,7 @@
 | ManagedBootImages| <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>  |
 | ManagedBootImagesAWS| <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>  |
 | ManagedBootImagesAzure| <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>  |
+| ManagedBootImagesvSphere| <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>  |
 | MetricsCollectionProfiles| <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>  |
 | NetworkDiagnosticsConfig| <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>  |
 | NetworkLiveMigration| <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
@@ -342,7 +342,7 @@ var (
 						contactPerson("rsaini").
 						productScope(ocpSpecific).
 						enhancementPR("https://github.com/openshift/enhancements/pull/1496").
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+						enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 						mustRegister()
 
 	FeatureGateManagedBootImagesAzure = newFeatureGate("ManagedBootImagesAzure").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -144,9 +144,6 @@
                     {
                         "name": "ManagedBootImagesCPMS"
                     },
-                    {
-                        "name": "ManagedBootImagesvSphere"
-                    },
                     {
                         "name": "MaxUnavailableStatefulSet"
                     },
@@ -278,6 +275,9 @@
                     {
                         "name": "ManagedBootImagesAzure"
                     },
+                    {
+                        "name": "ManagedBootImagesvSphere"
+                    },
                     {
                         "name": "MetricsCollectionProfiles"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -144,9 +144,6 @@
                     {
                         "name": "ManagedBootImagesCPMS"
                     },
-                    {
-                        "name": "ManagedBootImagesvSphere"
-                    },
                     {
                         "name": "MaxUnavailableStatefulSet"
                     },
@@ -275,6 +272,9 @@
                     {
                         "name": "ManagedBootImagesAzure"
                     },
+                    {
+                        "name": "ManagedBootImagesvSphere"
+                    },
                     {
                         "name": "MetricsCollectionProfiles"
                     },

Original file line number	Diff line number	Diff line change
`@@ -144,9 +144,6 @@`
`144`	`144`	`{`
`145`	`145`	`"name": "ManagedBootImagesCPMS"`
`146`	`146`	`},`
`147`		`- {`
`148`		`- "name": "ManagedBootImagesvSphere"`
`149`		`- },`
`150`	`147`	`{`
`151`	`148`	`"name": "MaxUnavailableStatefulSet"`
`152`	`149`	`},`
`@@ -278,6 +275,9 @@`
`278`	`275`	`{`
`279`	`276`	`"name": "ManagedBootImagesAzure"`
`280`	`277`	`},`
	`278`	`+ {`
	`279`	`+ "name": "ManagedBootImagesvSphere"`
	`280`	`+ },`
`281`	`281`	`{`
`282`	`282`	`"name": "MetricsCollectionProfiles"`
`283`	`283`	`},`