Merge pull request #2563 from openshift-cloud-team/ClusterAPIMachineManagement

openshift-merge-bot[bot] · web-flow · commit 621beb45a611 · 2025-11-06T07:55:29.000Z
OCPCLOUD-3214: Add ClusterAPIMachineManagement feature gate
diff --git a/features.md b/features.md
@@ -33,6 +33,7 @@
 | ClientsAllowCBOR| | | <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>  |
 | ClientsPreferCBOR| | | <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>  |
 | ClusterAPIInstallIBMCloud| | | <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>  |
+| ClusterAPIMachineManagement| | | <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>  |
 | ClusterMonitoringConfig| | | <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>  |
 | ClusterVersionOperatorConfiguration| | | <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>  |
 | DNSNameResolver| | | <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
@@ -553,6 +553,14 @@ var (
 					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 					mustRegister()
 
+	FeatureGateClusterAPIMachineManagement = newFeatureGate("ClusterAPIMachineManagement").
+						reportProblemsToJiraComponent("Cloud Compute / Cluster API Providers").
+						contactPerson("ddonati").
+						productScope(ocpSpecific).
+						enhancementPR("https://github.com/openshift/enhancements/pull/1465").
+						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+						mustRegister()
+
 	FeatureGateClusterAPIMachineManagementVSphere = newFeatureGate("ClusterAPIMachineManagementVSphere").
 							reportProblemsToJiraComponent("SPLAT").
 							contactPerson("jcpowermac").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -66,6 +66,9 @@
                     {
                         "name": "ClusterAPIInstallIBMCloud"
                     },
+                    {
+                        "name": "ClusterAPIMachineManagement"
+                    },
                     {
                         "name": "ClusterAPIMachineManagementVSphere"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -118,6 +118,9 @@
                     {
                         "name": "ClusterAPIInstallIBMCloud"
                     },
+                    {
+                        "name": "ClusterAPIMachineManagement"
+                    },
                     {
                         "name": "ClusterAPIMachineManagementVSphere"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -133,6 +133,9 @@
                     {
                         "name": "ClusterAPIInstallIBMCloud"
                     },
+                    {
+                        "name": "ClusterAPIMachineManagement"
+                    },
                     {
                         "name": "ClusterMonitoringConfig"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -66,6 +66,9 @@
                     {
                         "name": "ClusterAPIInstallIBMCloud"
                     },
+                    {
+                        "name": "ClusterAPIMachineManagement"
+                    },
                     {
                         "name": "ClusterAPIMachineManagementVSphere"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -100,6 +100,9 @@
                     {
                         "name": "ClusterAPIInstallIBMCloud"
                     },
+                    {
+                        "name": "ClusterAPIMachineManagement"
+                    },
                     {
                         "name": "ClusterAPIMachineManagementVSphere"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -115,6 +115,9 @@
                     {
                         "name": "ClusterAPIInstallIBMCloud"
                     },
+                    {
+                        "name": "ClusterAPIMachineManagement"
+                    },
                     {
                         "name": "ClusterMonitoringConfig"
                     },

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,9 @@`
`66`	`66`	`{`
`67`	`67`	`"name": "ClusterAPIInstallIBMCloud"`
`68`	`68`	`},`
	`69`	`+ {`
	`70`	`+ "name": "ClusterAPIMachineManagement"`
	`71`	`+ },`
`69`	`72`	`{`
`70`	`73`	`"name": "ClusterAPIMachineManagementVSphere"`
`71`	`74`	`},`
Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,9 @@`
`118`	`118`	`{`
`119`	`119`	`"name": "ClusterAPIInstallIBMCloud"`
`120`	`120`	`},`
	`121`	`+ {`
	`122`	`+ "name": "ClusterAPIMachineManagement"`
	`123`	`+ },`
`121`	`124`	`{`
`122`	`125`	`"name": "ClusterAPIMachineManagementVSphere"`
`123`	`126`	`},`
Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,9 @@`
`133`	`133`	`{`
`134`	`134`	`"name": "ClusterAPIInstallIBMCloud"`
`135`	`135`	`},`
	`136`	`+ {`
	`137`	`+ "name": "ClusterAPIMachineManagement"`
	`138`	`+ },`
`136`	`139`	`{`
`137`	`140`	`"name": "ClusterMonitoringConfig"`
`138`	`141`	`},`
Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,9 @@`
`100`	`100`	`{`
`101`	`101`	`"name": "ClusterAPIInstallIBMCloud"`
`102`	`102`	`},`
	`103`	`+ {`
	`104`	`+ "name": "ClusterAPIMachineManagement"`
	`105`	`+ },`
`103`	`106`	`{`
`104`	`107`	`"name": "ClusterAPIMachineManagementVSphere"`
`105`	`108`	`},`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,9 @@`
`115`	`115`	`{`
`116`	`116`	`"name": "ClusterAPIInstallIBMCloud"`
`117`	`117`	`},`
	`118`	`+ {`
	`119`	`+ "name": "ClusterAPIMachineManagement"`
	`120`	`+ },`
`118`	`121`	`{`
`119`	`122`	`"name": "ClusterMonitoringConfig"`
`120`	`123`	`},`