Merge pull request #2277 from stbenjam/revert-2261-1744632364109

openshift-merge-bot[bot] · web-flow · commit b7680e188c5e · 2025-04-14T14:03:16.000Z
TRT-2081: Revert #2261 "NE-2009: Enable GatewayAPI featuregate in Default featureset"
diff --git a/features.md b/features.md
@@ -29,6 +29,7 @@
 | Example| | | <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>  |
 | GCPClusterHostedDNS| | | <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>  |
 | GCPCustomAPIEndpoints| | | <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>  |
+| GatewayAPI| | | <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>  |
 | GatewayAPIController| | | <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>  |
 | HighlyAvailableArbiter| | | <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>  |
 | ImageStreamImportMode| | | <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>  |
@@ -78,7 +79,6 @@
 | CloudDualStackNodeIPs| <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>  |
 | DisableKubeletCloudCredentialProviders| <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>  |
 | GCPLabelsTags| <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>  |
-| GatewayAPI| <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>  |
 | HardwareSpeed| <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>  |
 | IngressControllerLBSubnetsAWS| <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>  |
 | KMSv1| <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
@@ -65,7 +65,7 @@ var (
 				contactPerson("miciah").
 				productScope(ocpSpecific).
 				enhancementPR(legacyFeatureGateWithoutEnhancement).
-				enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+				enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 				mustRegister()
 
 	FeatureGateSetEIPForNLBIngressController = newFeatureGate("SetEIPForNLBIngressController").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -70,6 +70,9 @@
                     {
                         "name": "GCPCustomAPIEndpoints"
                     },
+                    {
+                        "name": "GatewayAPI"
+                    },
                     {
                         "name": "GatewayAPIController"
                     },
@@ -249,9 +252,6 @@
                     {
                         "name": "GCPLabelsTags"
                     },
-                    {
-                        "name": "GatewayAPI"
-                    },
                     {
                         "name": "HardwareSpeed"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -73,6 +73,9 @@
                     {
                         "name": "GCPCustomAPIEndpoints"
                     },
+                    {
+                        "name": "GatewayAPI"
+                    },
                     {
                         "name": "GatewayAPIController"
                     },
@@ -246,9 +249,6 @@
                     {
                         "name": "GCPLabelsTags"
                     },
-                    {
-                        "name": "GatewayAPI"
-                    },
                     {
                         "name": "HardwareSpeed"
                     },

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,9 @@`
`70`	`70`	`{`
`71`	`71`	`"name": "GCPCustomAPIEndpoints"`
`72`	`72`	`},`
	`73`	`+ {`
	`74`	`+ "name": "GatewayAPI"`
	`75`	`+ },`
`73`	`76`	`{`
`74`	`77`	`"name": "GatewayAPIController"`
`75`	`78`	`},`
`@@ -249,9 +252,6 @@`
`249`	`252`	`{`
`250`	`253`	`"name": "GCPLabelsTags"`
`251`	`254`	`},`
`252`		`- {`
`253`		`- "name": "GatewayAPI"`
`254`		`- },`
`255`	`255`	`{`
`256`	`256`	`"name": "HardwareSpeed"`
`257`	`257`	`},`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,9 @@`
`73`	`73`	`{`
`74`	`74`	`"name": "GCPCustomAPIEndpoints"`
`75`	`75`	`},`
	`76`	`+ {`
	`77`	`+ "name": "GatewayAPI"`
	`78`	`+ },`
`76`	`79`	`{`
`77`	`80`	`"name": "GatewayAPIController"`
`78`	`81`	`},`
`@@ -246,9 +249,6 @@`
`246`	`249`	`{`
`247`	`250`	`"name": "GCPLabelsTags"`
`248`	`251`	`},`
`249`		`- {`
`250`		`- "name": "GatewayAPI"`
`251`		`- },`
`252`	`252`	`{`
`253`	`253`	`"name": "HardwareSpeed"`
`254`	`254`	`},`