Merge pull request #2679 from djoshy/promo-cpms-bootimage-updates

openshift-merge-bot[bot] · web-flow · commit 618697272d69 · 2026-02-03T11:12:18.000Z
MCO-1931: Promote ManagedBootImagesCPMS feature gate to the Default featureset
diff --git a/features.md b/features.md
@@ -59,7 +59,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>  |
 | KMSEncryption| | | <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>  |
 | 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>  |
@@ -98,6 +97,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> | <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> | <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> | <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> | <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> | <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> | <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
diff --git a/features/features.go b/features/features.go
@@ -358,7 +358,7 @@ var (
 						contactPerson("djoshy").
 						productScope(ocpSpecific).
 						enhancementPR("https://github.com/openshift/enhancements/pull/1818").
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+						enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 						mustRegister()
 
 	FeatureGateBootImageSkewEnforcement = newFeatureGate("BootImageSkewEnforcement").
diff --git a/operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations-Default.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations-Default.crd.yaml
@@ -108,6 +108,7 @@ spec:
                             controlplanemachinesets means that the machine manager will only register resources of the kind ControlPlaneMachineSet.
                           enum:
                           - machinesets
+                          - controlplanemachinesets
                           type: string
                         selection:
                           description: selection allows granular control of the machine
@@ -197,6 +198,11 @@ spec:
                       - resource
                       - selection
                       type: object
+                      x-kubernetes-validations:
+                      - message: Only All or None selection mode is permitted for
+                          ControlPlaneMachineSets
+                        rule: self.resource != 'controlplanemachinesets' || self.selection.mode
+                          == 'All' || self.selection.mode == 'None'
                     maxItems: 5
                     type: array
                     x-kubernetes-list-map-keys:
@@ -741,6 +747,7 @@ spec:
                             controlplanemachinesets means that the machine manager will only register resources of the kind ControlPlaneMachineSet.
                           enum:
                           - machinesets
+                          - controlplanemachinesets
                           type: string
                         selection:
                           description: selection allows granular control of the machine
@@ -830,6 +837,11 @@ spec:
                       - resource
                       - selection
                       type: object
+                      x-kubernetes-validations:
+                      - message: Only All or None selection mode is permitted for
+                          ControlPlaneMachineSets
+                        rule: self.resource != 'controlplanemachinesets' || self.selection.mode
+                          == 'All' || self.selection.mode == 'None'
                     maxItems: 5
                     type: array
                     x-kubernetes-list-map-keys:
diff --git a/operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations-OKD.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations-OKD.crd.yaml
@@ -108,6 +108,7 @@ spec:
                             controlplanemachinesets means that the machine manager will only register resources of the kind ControlPlaneMachineSet.
                           enum:
                           - machinesets
+                          - controlplanemachinesets
                           type: string
                         selection:
                           description: selection allows granular control of the machine
@@ -197,6 +198,11 @@ spec:
                       - resource
                       - selection
                       type: object
+                      x-kubernetes-validations:
+                      - message: Only All or None selection mode is permitted for
+                          ControlPlaneMachineSets
+                        rule: self.resource != 'controlplanemachinesets' || self.selection.mode
+                          == 'All' || self.selection.mode == 'None'
                     maxItems: 5
                     type: array
                     x-kubernetes-list-map-keys:
@@ -741,6 +747,7 @@ spec:
                             controlplanemachinesets means that the machine manager will only register resources of the kind ControlPlaneMachineSet.
                           enum:
                           - machinesets
+                          - controlplanemachinesets
                           type: string
                         selection:
                           description: selection allows granular control of the machine
@@ -830,6 +837,11 @@ spec:
                       - resource
                       - selection
                       type: object
+                      x-kubernetes-validations:
+                      - message: Only All or None selection mode is permitted for
+                          ControlPlaneMachineSets
+                        rule: self.resource != 'controlplanemachinesets' || self.selection.mode
+                          == 'All' || self.selection.mode == 'None'
                     maxItems: 5
                     type: array
                     x-kubernetes-list-map-keys:
diff --git a/payload-manifests/crds/0000_80_machine-config_01_machineconfigurations-Default.crd.yaml b/payload-manifests/crds/0000_80_machine-config_01_machineconfigurations-Default.crd.yaml
@@ -108,6 +108,7 @@ spec:
                             controlplanemachinesets means that the machine manager will only register resources of the kind ControlPlaneMachineSet.
                           enum:
                           - machinesets
+                          - controlplanemachinesets
                           type: string
                         selection:
                           description: selection allows granular control of the machine
@@ -197,6 +198,11 @@ spec:
                       - resource
                       - selection
                       type: object
+                      x-kubernetes-validations:
+                      - message: Only All or None selection mode is permitted for
+                          ControlPlaneMachineSets
+                        rule: self.resource != 'controlplanemachinesets' || self.selection.mode
+                          == 'All' || self.selection.mode == 'None'
                     maxItems: 5
                     type: array
                     x-kubernetes-list-map-keys:
@@ -741,6 +747,7 @@ spec:
                             controlplanemachinesets means that the machine manager will only register resources of the kind ControlPlaneMachineSet.
                           enum:
                           - machinesets
+                          - controlplanemachinesets
                           type: string
                         selection:
                           description: selection allows granular control of the machine
@@ -830,6 +837,11 @@ spec:
                       - resource
                       - selection
                       type: object
+                      x-kubernetes-validations:
+                      - message: Only All or None selection mode is permitted for
+                          ControlPlaneMachineSets
+                        rule: self.resource != 'controlplanemachinesets' || self.selection.mode
+                          == 'All' || self.selection.mode == 'None'
                     maxItems: 5
                     type: array
                     x-kubernetes-list-map-keys:
diff --git a/payload-manifests/crds/0000_80_machine-config_01_machineconfigurations-OKD.crd.yaml b/payload-manifests/crds/0000_80_machine-config_01_machineconfigurations-OKD.crd.yaml
@@ -108,6 +108,7 @@ spec:
                             controlplanemachinesets means that the machine manager will only register resources of the kind ControlPlaneMachineSet.
                           enum:
                           - machinesets
+                          - controlplanemachinesets
                           type: string
                         selection:
                           description: selection allows granular control of the machine
@@ -197,6 +198,11 @@ spec:
                       - resource
                       - selection
                       type: object
+                      x-kubernetes-validations:
+                      - message: Only All or None selection mode is permitted for
+                          ControlPlaneMachineSets
+                        rule: self.resource != 'controlplanemachinesets' || self.selection.mode
+                          == 'All' || self.selection.mode == 'None'
                     maxItems: 5
                     type: array
                     x-kubernetes-list-map-keys:
@@ -741,6 +747,7 @@ spec:
                             controlplanemachinesets means that the machine manager will only register resources of the kind ControlPlaneMachineSet.
                           enum:
                           - machinesets
+                          - controlplanemachinesets
                           type: string
                         selection:
                           description: selection allows granular control of the machine
@@ -830,6 +837,11 @@ spec:
                       - resource
                       - selection
                       type: object
+                      x-kubernetes-validations:
+                      - message: Only All or None selection mode is permitted for
+                          ControlPlaneMachineSets
+                        rule: self.resource != 'controlplanemachinesets' || self.selection.mode
+                          == 'All' || self.selection.mode == 'None'
                     maxItems: 5
                     type: array
                     x-kubernetes-list-map-keys:
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -162,9 +162,6 @@
                     {
                         "name": "MachineAPIOperatorDisableMachineHealthCheckController"
                     },
-                    {
-                        "name": "ManagedBootImagesCPMS"
-                    },
                     {
                         "name": "MaxUnavailableStatefulSet"
                     },
@@ -308,6 +305,9 @@
                     {
                         "name": "ManagedBootImagesAzure"
                     },
+                    {
+                        "name": "ManagedBootImagesCPMS"
+                    },
                     {
                         "name": "ManagedBootImagesvSphere"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-Hypershift-OKD.yaml
@@ -164,9 +164,6 @@
                     {
                         "name": "MachineAPIOperatorDisableMachineHealthCheckController"
                     },
-                    {
-                        "name": "ManagedBootImagesCPMS"
-                    },
                     {
                         "name": "MaxUnavailableStatefulSet"
                     },
@@ -310,6 +307,9 @@
                     {
                         "name": "ManagedBootImagesAzure"
                     },
+                    {
+                        "name": "ManagedBootImagesCPMS"
+                    },
                     {
                         "name": "ManagedBootImagesvSphere"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -165,9 +165,6 @@
                     {
                         "name": "MachineAPIOperatorDisableMachineHealthCheckController"
                     },
-                    {
-                        "name": "ManagedBootImagesCPMS"
-                    },
                     {
                         "name": "MaxUnavailableStatefulSet"
                     },
@@ -299,6 +296,9 @@
                     {
                         "name": "ManagedBootImagesAzure"
                     },
+                    {
+                        "name": "ManagedBootImagesCPMS"
+                    },
                     {
                         "name": "ManagedBootImagesvSphere"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-OKD.yaml
@@ -167,9 +167,6 @@
                     {
                         "name": "MachineAPIOperatorDisableMachineHealthCheckController"
                     },
-                    {
-                        "name": "ManagedBootImagesCPMS"
-                    },
                     {
                         "name": "MaxUnavailableStatefulSet"
                     },
@@ -301,6 +298,9 @@
                     {
                         "name": "ManagedBootImagesAzure"
                     },
+                    {
+                        "name": "ManagedBootImagesCPMS"
+                    },
                     {
                         "name": "ManagedBootImagesvSphere"
                     },

Original file line number	Diff line number	Diff line change
`@@ -162,9 +162,6 @@`
`162`	`162`	`{`
`163`	`163`	`"name": "MachineAPIOperatorDisableMachineHealthCheckController"`
`164`	`164`	`},`
`165`		`- {`
`166`		`- "name": "ManagedBootImagesCPMS"`
`167`		`- },`
`168`	`165`	`{`
`169`	`166`	`"name": "MaxUnavailableStatefulSet"`
`170`	`167`	`},`
`@@ -308,6 +305,9 @@`
`308`	`305`	`{`
`309`	`306`	`"name": "ManagedBootImagesAzure"`
`310`	`307`	`},`
	`308`	`+ {`
	`309`	`+ "name": "ManagedBootImagesCPMS"`
	`310`	`+ },`
`311`	`311`	`{`
`312`	`312`	`"name": "ManagedBootImagesvSphere"`
`313`	`313`	`},`
Original file line number	Diff line number	Diff line change
`@@ -164,9 +164,6 @@`
`164`	`164`	`{`
`165`	`165`	`"name": "MachineAPIOperatorDisableMachineHealthCheckController"`
`166`	`166`	`},`
`167`		`- {`
`168`		`- "name": "ManagedBootImagesCPMS"`
`169`		`- },`
`170`	`167`	`{`
`171`	`168`	`"name": "MaxUnavailableStatefulSet"`
`172`	`169`	`},`
`@@ -310,6 +307,9 @@`
`310`	`307`	`{`
`311`	`308`	`"name": "ManagedBootImagesAzure"`
`312`	`309`	`},`
	`310`	`+ {`
	`311`	`+ "name": "ManagedBootImagesCPMS"`
	`312`	`+ },`
`313`	`313`	`{`
`314`	`314`	`"name": "ManagedBootImagesvSphere"`
`315`	`315`	`},`
Original file line number	Diff line number	Diff line change
`@@ -165,9 +165,6 @@`
`165`	`165`	`{`
`166`	`166`	`"name": "MachineAPIOperatorDisableMachineHealthCheckController"`
`167`	`167`	`},`
`168`		`- {`
`169`		`- "name": "ManagedBootImagesCPMS"`
`170`		`- },`
`171`	`168`	`{`
`172`	`169`	`"name": "MaxUnavailableStatefulSet"`
`173`	`170`	`},`
`@@ -299,6 +296,9 @@`
`299`	`296`	`{`
`300`	`297`	`"name": "ManagedBootImagesAzure"`
`301`	`298`	`},`
	`299`	`+ {`
	`300`	`+ "name": "ManagedBootImagesCPMS"`
	`301`	`+ },`
`302`	`302`	`{`
`303`	`303`	`"name": "ManagedBootImagesvSphere"`
`304`	`304`	`},`
Original file line number	Diff line number	Diff line change
`@@ -167,9 +167,6 @@`
`167`	`167`	`{`
`168`	`168`	`"name": "MachineAPIOperatorDisableMachineHealthCheckController"`
`169`	`169`	`},`
`170`		`- {`
`171`		`- "name": "ManagedBootImagesCPMS"`
`172`		`- },`
`173`	`170`	`{`
`174`	`171`	`"name": "MaxUnavailableStatefulSet"`
`175`	`172`	`},`
`@@ -301,6 +298,9 @@`
`301`	`298`	`{`
`302`	`299`	`"name": "ManagedBootImagesAzure"`
`303`	`300`	`},`
	`301`	`+ {`
	`302`	`+ "name": "ManagedBootImagesCPMS"`
	`303`	`+ },`
`304`	`304`	`{`
`305`	`305`	`"name": "ManagedBootImagesvSphere"`
`306`	`306`	`},`