Merge pull request openshift#2332 from barbacbd/OCPBUGS-55672

openshift-merge-bot[bot] · web-flow · commit 1ee08669554d · 2025-05-20T23:59:26.000Z
OCPBUGS-55672: Remove MultiArchInstallGCP featuregate
diff --git a/features.md b/features.md
@@ -82,7 +82,6 @@
 | 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>  |
-| MultiArchInstallGCP| <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
@@ -524,12 +524,12 @@ var (
 						mustRegister()
 
 	FeatureGateNewOLMWebhookProviderOpenshiftServiceCA = newFeatureGate("NewOLMWebhookProviderOpenshiftServiceCA").
-						reportProblemsToJiraComponent("olm").
-						contactPerson("pegoncal").
-						productScope(ocpSpecific).
-						enhancementPR("https://github.com/openshift/enhancements/pull/1799").
-						enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+								reportProblemsToJiraComponent("olm").
+								contactPerson("pegoncal").
+								productScope(ocpSpecific).
+								enhancementPR("https://github.com/openshift/enhancements/pull/1799").
+								enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+								mustRegister()
 
 	FeatureGateInsightsOnDemandDataGather = newFeatureGate("InsightsOnDemandDataGather").
 						reportProblemsToJiraComponent("insights").
@@ -618,14 +618,6 @@ var (
 						enhancementPR(legacyFeatureGateWithoutEnhancement).
 						mustRegister()
 
-	FeatureGateMultiArchInstallGCP = newFeatureGate("MultiArchInstallGCP").
-					reportProblemsToJiraComponent("Installer").
-					contactPerson("r4f4").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
-
 	FeatureGateIngressControllerLBSubnetsAWS = newFeatureGate("IngressControllerLBSubnetsAWS").
 							reportProblemsToJiraComponent("Routing").
 							contactPerson("miciah").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -261,9 +261,6 @@
                     {
                         "name": "MultiArchInstallAWS"
                     },
-                    {
-                        "name": "MultiArchInstallGCP"
-                    },
                     {
                         "name": "NetworkDiagnosticsConfig"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -203,9 +203,6 @@
                     {
                         "name": "MultiArchInstallAWS"
                     },
-                    {
-                        "name": "MultiArchInstallGCP"
-                    },
                     {
                         "name": "NetworkDiagnosticsConfig"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -215,9 +215,6 @@
                     {
                         "name": "MultiArchInstallAWS"
                     },
-                    {
-                        "name": "MultiArchInstallGCP"
-                    },
                     {
                         "name": "NetworkDiagnosticsConfig"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -258,9 +258,6 @@
                     {
                         "name": "MultiArchInstallAWS"
                     },
-                    {
-                        "name": "MultiArchInstallGCP"
-                    },
                     {
                         "name": "NetworkDiagnosticsConfig"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -188,9 +188,6 @@
                     {
                         "name": "MultiArchInstallAWS"
                     },
-                    {
-                        "name": "MultiArchInstallGCP"
-                    },
                     {
                         "name": "NetworkDiagnosticsConfig"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -200,9 +200,6 @@
                     {
                         "name": "MultiArchInstallAWS"
                     },
-                    {
-                        "name": "MultiArchInstallGCP"
-                    },
                     {
                         "name": "NetworkDiagnosticsConfig"
                     },

Original file line number	Diff line number	Diff line change
`@@ -261,9 +261,6 @@`
`261`	`261`	`{`
`262`	`262`	`"name": "MultiArchInstallAWS"`
`263`	`263`	`},`
`264`		`- {`
`265`		`- "name": "MultiArchInstallGCP"`
`266`		`- },`
`267`	`264`	`{`
`268`	`265`	`"name": "NetworkDiagnosticsConfig"`
`269`	`266`	`},`
Original file line number	Diff line number	Diff line change
`@@ -203,9 +203,6 @@`
`203`	`203`	`{`
`204`	`204`	`"name": "MultiArchInstallAWS"`
`205`	`205`	`},`
`206`		`- {`
`207`		`- "name": "MultiArchInstallGCP"`
`208`		`- },`
`209`	`206`	`{`
`210`	`207`	`"name": "NetworkDiagnosticsConfig"`
`211`	`208`	`},`
Original file line number	Diff line number	Diff line change
`@@ -215,9 +215,6 @@`
`215`	`215`	`{`
`216`	`216`	`"name": "MultiArchInstallAWS"`
`217`	`217`	`},`
`218`		`- {`
`219`		`- "name": "MultiArchInstallGCP"`
`220`		`- },`
`221`	`218`	`{`
`222`	`219`	`"name": "NetworkDiagnosticsConfig"`
`223`	`220`	`},`
Original file line number	Diff line number	Diff line change
`@@ -258,9 +258,6 @@`
`258`	`258`	`{`
`259`	`259`	`"name": "MultiArchInstallAWS"`
`260`	`260`	`},`
`261`		`- {`
`262`		`- "name": "MultiArchInstallGCP"`
`263`		`- },`
`264`	`261`	`{`
`265`	`262`	`"name": "NetworkDiagnosticsConfig"`
`266`	`263`	`},`
Original file line number	Diff line number	Diff line change
`@@ -188,9 +188,6 @@`
`188`	`188`	`{`
`189`	`189`	`"name": "MultiArchInstallAWS"`
`190`	`190`	`},`
`191`		`- {`
`192`		`- "name": "MultiArchInstallGCP"`
`193`		`- },`
`194`	`191`	`{`
`195`	`192`	`"name": "NetworkDiagnosticsConfig"`
`196`	`193`	`},`
Original file line number	Diff line number	Diff line change
`@@ -200,9 +200,6 @@`
`200`	`200`	`{`
`201`	`201`	`"name": "MultiArchInstallAWS"`
`202`	`202`	`},`
`203`		`- {`
`204`		`- "name": "MultiArchInstallGCP"`
`205`		`- },`
`206`	`203`	`{`
`207`	`204`	`"name": "NetworkDiagnosticsConfig"`
`208`	`205`	`},`