Merge pull request #2307 from mdbooth/remove-mapo-fg

openshift-merge-bot[bot] · web-flow · commit 7318813e48da · 2025-05-07T15:09:12.000Z
OCPBUGS-55666: Remove MachineAPIProviderOpenStack feature gate
diff --git a/features.md b/features.md
@@ -38,7 +38,6 @@
 | InsightsRuntimeExtractor| | | <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>  |
-| MachineAPIProviderOpenStack| | | <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>  |
 | 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>  |
 | 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>  |
diff --git a/features/features.go b/features/features.go
@@ -100,14 +100,6 @@ var (
 				enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 				mustRegister()
 
-	FeatureGateMachineAPIProviderOpenStack = newFeatureGate("MachineAPIProviderOpenStack").
-						reportProblemsToJiraComponent("openstack").
-						contactPerson("egarcia").
-						productScope(ocpSpecific).
-						enhancementPR(legacyFeatureGateWithoutEnhancement).
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
-
 	FeatureGateInsightsConfigAPI = newFeatureGate("InsightsConfigAPI").
 					reportProblemsToJiraComponent("insights").
 					contactPerson("tremes").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -100,9 +100,6 @@
                     {
                         "name": "MachineAPIOperatorDisableMachineHealthCheckController"
                     },
-                    {
-                        "name": "MachineAPIProviderOpenStack"
-                    },
                     {
                         "name": "MachineConfigNodes"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -179,9 +179,6 @@
                     {
                         "name": "MachineAPIMigration"
                     },
-                    {
-                        "name": "MachineAPIProviderOpenStack"
-                    },
                     {
                         "name": "MachineConfigNodes"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -188,9 +188,6 @@
                     {
                         "name": "MachineAPIMigration"
                     },
-                    {
-                        "name": "MachineAPIProviderOpenStack"
-                    },
                     {
                         "name": "MachineConfigNodes"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -103,9 +103,6 @@
                     {
                         "name": "MachineAPIOperatorDisableMachineHealthCheckController"
                     },
-                    {
-                        "name": "MachineAPIProviderOpenStack"
-                    },
                     {
                         "name": "MachineConfigNodes"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -167,9 +167,6 @@
                     {
                         "name": "MachineAPIMigration"
                     },
-                    {
-                        "name": "MachineAPIProviderOpenStack"
-                    },
                     {
                         "name": "MachineConfigNodes"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -176,9 +176,6 @@
                     {
                         "name": "MachineAPIMigration"
                     },
-                    {
-                        "name": "MachineAPIProviderOpenStack"
-                    },
                     {
                         "name": "MachineConfigNodes"
                     },

Original file line number	Diff line number	Diff line change
`@@ -100,9 +100,6 @@`
`100`	`100`	`{`
`101`	`101`	`"name": "MachineAPIOperatorDisableMachineHealthCheckController"`
`102`	`102`	`},`
`103`		`- {`
`104`		`- "name": "MachineAPIProviderOpenStack"`
`105`		`- },`
`106`	`103`	`{`
`107`	`104`	`"name": "MachineConfigNodes"`
`108`	`105`	`},`
Original file line number	Diff line number	Diff line change
`@@ -179,9 +179,6 @@`
`179`	`179`	`{`
`180`	`180`	`"name": "MachineAPIMigration"`
`181`	`181`	`},`
`182`		`- {`
`183`		`- "name": "MachineAPIProviderOpenStack"`
`184`		`- },`
`185`	`182`	`{`
`186`	`183`	`"name": "MachineConfigNodes"`
`187`	`184`	`},`
Original file line number	Diff line number	Diff line change
`@@ -188,9 +188,6 @@`
`188`	`188`	`{`
`189`	`189`	`"name": "MachineAPIMigration"`
`190`	`190`	`},`
`191`		`- {`
`192`		`- "name": "MachineAPIProviderOpenStack"`
`193`		`- },`
`194`	`191`	`{`
`195`	`192`	`"name": "MachineConfigNodes"`
`196`	`193`	`},`
Original file line number	Diff line number	Diff line change
`@@ -103,9 +103,6 @@`
`103`	`103`	`{`
`104`	`104`	`"name": "MachineAPIOperatorDisableMachineHealthCheckController"`
`105`	`105`	`},`
`106`		`- {`
`107`		`- "name": "MachineAPIProviderOpenStack"`
`108`		`- },`
`109`	`106`	`{`
`110`	`107`	`"name": "MachineConfigNodes"`
`111`	`108`	`},`
Original file line number	Diff line number	Diff line change
`@@ -167,9 +167,6 @@`
`167`	`167`	`{`
`168`	`168`	`"name": "MachineAPIMigration"`
`169`	`169`	`},`
`170`		`- {`
`171`		`- "name": "MachineAPIProviderOpenStack"`
`172`		`- },`
`173`	`170`	`{`
`174`	`171`	`"name": "MachineConfigNodes"`
`175`	`172`	`},`
Original file line number	Diff line number	Diff line change
`@@ -176,9 +176,6 @@`
`176`	`176`	`{`
`177`	`177`	`"name": "MachineAPIMigration"`
`178`	`178`	`},`
`179`		`- {`
`180`		`- "name": "MachineAPIProviderOpenStack"`
`181`		`- },`
`182`	`179`	`{`
`183`	`180`	`"name": "MachineConfigNodes"`
`184`	`181`	`},`