Merge pull request openshift#2336 from barbacbd/OCPBUGS-55671

openshift-merge-bot[bot] · web-flow · commit 3fa679913fa6 · 2025-05-26T16:04:06.000Z
OCPBUGS-55671: Remove MultiArchInstallAWS featuregate
diff --git a/features.md b/features.md
@@ -80,7 +80,6 @@
 | 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>  |
 | 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>  |
-| MultiArchInstallAWS| <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>  |
 | NetworkSegmentation| <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
@@ -603,14 +603,6 @@ var (
 						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 						mustRegister()
 
-	FeatureGateMultiArchInstallAWS = newFeatureGate("MultiArchInstallAWS").
-					reportProblemsToJiraComponent("Installer").
-					contactPerson("r4f4").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
-
 	FeatureGateMultiArchInstallAzure = newFeatureGate("MultiArchInstallAzure").
 						reportProblemsToJiraComponent("Installer").
 						contactPerson("r4f4").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -255,9 +255,6 @@
                     {
                         "name": "MetricsCollectionProfiles"
                     },
-                    {
-                        "name": "MultiArchInstallAWS"
-                    },
                     {
                         "name": "NetworkDiagnosticsConfig"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -200,9 +200,6 @@
                     {
                         "name": "MixedCPUsAllocation"
                     },
-                    {
-                        "name": "MultiArchInstallAWS"
-                    },
                     {
                         "name": "NetworkDiagnosticsConfig"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -206,9 +206,6 @@
                     {
                         "name": "MixedCPUsAllocation"
                     },
-                    {
-                        "name": "MultiArchInstallAWS"
-                    },
                     {
                         "name": "NetworkDiagnosticsConfig"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -252,9 +252,6 @@
                     {
                         "name": "MetricsCollectionProfiles"
                     },
-                    {
-                        "name": "MultiArchInstallAWS"
-                    },
                     {
                         "name": "NetworkDiagnosticsConfig"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -185,9 +185,6 @@
                     {
                         "name": "MixedCPUsAllocation"
                     },
-                    {
-                        "name": "MultiArchInstallAWS"
-                    },
                     {
                         "name": "NetworkDiagnosticsConfig"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -191,9 +191,6 @@
                     {
                         "name": "MixedCPUsAllocation"
                     },
-                    {
-                        "name": "MultiArchInstallAWS"
-                    },
                     {
                         "name": "NetworkDiagnosticsConfig"
                     },

Original file line number	Diff line number	Diff line change
`@@ -255,9 +255,6 @@`
`255`	`255`	`{`
`256`	`256`	`"name": "MetricsCollectionProfiles"`
`257`	`257`	`},`
`258`		`- {`
`259`		`- "name": "MultiArchInstallAWS"`
`260`		`- },`
`261`	`258`	`{`
`262`	`259`	`"name": "NetworkDiagnosticsConfig"`
`263`	`260`	`},`
Original file line number	Diff line number	Diff line change
`@@ -200,9 +200,6 @@`
`200`	`200`	`{`
`201`	`201`	`"name": "MixedCPUsAllocation"`
`202`	`202`	`},`
`203`		`- {`
`204`		`- "name": "MultiArchInstallAWS"`
`205`		`- },`
`206`	`203`	`{`
`207`	`204`	`"name": "NetworkDiagnosticsConfig"`
`208`	`205`	`},`
Original file line number	Diff line number	Diff line change
`@@ -206,9 +206,6 @@`
`206`	`206`	`{`
`207`	`207`	`"name": "MixedCPUsAllocation"`
`208`	`208`	`},`
`209`		`- {`
`210`		`- "name": "MultiArchInstallAWS"`
`211`		`- },`
`212`	`209`	`{`
`213`	`210`	`"name": "NetworkDiagnosticsConfig"`
`214`	`211`	`},`
Original file line number	Diff line number	Diff line change
`@@ -252,9 +252,6 @@`
`252`	`252`	`{`
`253`	`253`	`"name": "MetricsCollectionProfiles"`
`254`	`254`	`},`
`255`		`- {`
`256`		`- "name": "MultiArchInstallAWS"`
`257`		`- },`
`258`	`255`	`{`
`259`	`256`	`"name": "NetworkDiagnosticsConfig"`
`260`	`257`	`},`
Original file line number	Diff line number	Diff line change
`@@ -185,9 +185,6 @@`
`185`	`185`	`{`
`186`	`186`	`"name": "MixedCPUsAllocation"`
`187`	`187`	`},`
`188`		`- {`
`189`		`- "name": "MultiArchInstallAWS"`
`190`		`- },`
`191`	`188`	`{`
`192`	`189`	`"name": "NetworkDiagnosticsConfig"`
`193`	`190`	`},`
Original file line number	Diff line number	Diff line change
`@@ -191,9 +191,6 @@`
`191`	`191`	`{`
`192`	`192`	`"name": "MixedCPUsAllocation"`
`193`	`193`	`},`
`194`		`- {`
`195`		`- "name": "MultiArchInstallAWS"`
`196`		`- },`
`197`	`194`	`{`
`198`	`195`	`"name": "NetworkDiagnosticsConfig"`
`199`	`196`	`},`