OCPBUGS-55672: Remove MultiArchInstallGCP featuregate

barbacbd · barbacbd · commit 6a1b99d46d39 · 2025-05-19T13:40:36.000-04:00
** The MultiArchInstallGCP feature gate has been enabled by default. This change removes the check for the feature gate during gcp installs, and the feature gate is treated as enabled by default.
diff --git a/features.md b/features.md
@@ -81,7 +81,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
@@ -258,9 +258,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
@@ -212,9 +212,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
@@ -255,9 +255,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
@@ -197,9 +197,6 @@
                     {
                         "name": "MultiArchInstallAWS"
                     },
-                    {
-                        "name": "MultiArchInstallGCP"
-                    },
                     {
                         "name": "NetworkDiagnosticsConfig"
                     },

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
`@@ -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
`@@ -212,9 +212,6 @@`
`212`	`212`	`{`
`213`	`213`	`"name": "MultiArchInstallAWS"`
`214`	`214`	`},`
`215`		`- {`
`216`		`- "name": "MultiArchInstallGCP"`
`217`		`- },`
`218`	`215`	`{`
`219`	`216`	`"name": "NetworkDiagnosticsConfig"`
`220`	`217`	`},`
Original file line number	Diff line number	Diff line change
`@@ -255,9 +255,6 @@`
`255`	`255`	`{`
`256`	`256`	`"name": "MultiArchInstallAWS"`
`257`	`257`	`},`
`258`		`- {`
`259`		`- "name": "MultiArchInstallGCP"`
`260`		`- },`
`261`	`258`	`{`
`262`	`259`	`"name": "NetworkDiagnosticsConfig"`
`263`	`260`	`},`
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
`@@ -197,9 +197,6 @@`
`197`	`197`	`{`
`198`	`198`	`"name": "MultiArchInstallAWS"`
`199`	`199`	`},`
`200`		`- {`
`201`		`- "name": "MultiArchInstallGCP"`
`202`		`- },`
`203`	`200`	`{`
`204`	`201`	`"name": "NetworkDiagnosticsConfig"`
`205`	`202`	`},`