Merge pull request #2526 from djoshy/promo-azure-boot-images

openshift-merge-bot[bot] · web-flow · commit 44baf885fd37 · 2025-10-16T08:01:53.000Z
MCO-1873: promote ManagedBootImagesAzure to default
diff --git a/features.md b/features.md
@@ -52,7 +52,6 @@
 | IrreconcilableMachineConfig| | | <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>  |
 | 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>  |
-| 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>  |
 | 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>  |
@@ -88,6 +87,7 @@
 | MachineConfigNodes| <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>  |
 | 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>  |
 | 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
@@ -350,7 +350,7 @@ var (
 						contactPerson("djoshy").
 						productScope(ocpSpecific).
 						enhancementPR("https://github.com/openshift/enhancements/pull/1761").
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+						enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 						mustRegister()
 
 	FeatureGateManagedBootImagesCPMS = newFeatureGate("ManagedBootImagesCPMS").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -141,9 +141,6 @@
                     {
                         "name": "MachineAPIOperatorDisableMachineHealthCheckController"
                     },
-                    {
-                        "name": "ManagedBootImagesAzure"
-                    },
                     {
                         "name": "ManagedBootImagesCPMS"
                     },
@@ -278,6 +275,9 @@
                     {
                         "name": "ManagedBootImagesAWS"
                     },
+                    {
+                        "name": "ManagedBootImagesAzure"
+                    },
                     {
                         "name": "MetricsCollectionProfiles"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -141,9 +141,6 @@
                     {
                         "name": "MachineAPIOperatorDisableMachineHealthCheckController"
                     },
-                    {
-                        "name": "ManagedBootImagesAzure"
-                    },
                     {
                         "name": "ManagedBootImagesCPMS"
                     },
@@ -275,6 +272,9 @@
                     {
                         "name": "ManagedBootImagesAWS"
                     },
+                    {
+                        "name": "ManagedBootImagesAzure"
+                    },
                     {
                         "name": "MetricsCollectionProfiles"
                     },

Original file line number	Diff line number	Diff line change
`@@ -141,9 +141,6 @@`
`141`	`141`	`{`
`142`	`142`	`"name": "MachineAPIOperatorDisableMachineHealthCheckController"`
`143`	`143`	`},`
`144`		`- {`
`145`		`- "name": "ManagedBootImagesAzure"`
`146`		`- },`
`147`	`144`	`{`
`148`	`145`	`"name": "ManagedBootImagesCPMS"`
`149`	`146`	`},`
`@@ -278,6 +275,9 @@`
`278`	`275`	`{`
`279`	`276`	`"name": "ManagedBootImagesAWS"`
`280`	`277`	`},`
	`278`	`+ {`
	`279`	`+ "name": "ManagedBootImagesAzure"`
	`280`	`+ },`
`281`	`281`	`{`
`282`	`282`	`"name": "MetricsCollectionProfiles"`
`283`	`283`	`},`