Merge pull request #2742 from rhamini3/gwapi-fg

openshift-merge-bot[bot] · web-flow · commit 42a8ece21b5c · 2026-03-06T20:00:31.000Z
OCPBUGS-74508: Remove GatewayAPI featuregates
diff --git a/features.md b/features.md
@@ -95,8 +95,6 @@
 | ExternalOIDC| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | ExternalOIDCWithUIDAndExtraClaimMappings| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | GCPClusterHostedDNSInstall| <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> | <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> | <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> | <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> | <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> | <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>  |
 | ImageVolume| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
diff --git a/features/features.go b/features/features.go
@@ -99,14 +99,6 @@ var (
 						enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
 						mustRegister()
 
-	FeatureGateGatewayAPI = newFeatureGate("GatewayAPI").
-				reportProblemsToJiraComponent("Routing").
-				contactPerson("miciah").
-				productScope(ocpSpecific).
-				enhancementPR(legacyFeatureGateWithoutEnhancement).
-				enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
-				mustRegister()
-
 	FeatureGateOpenShiftPodSecurityAdmission = newFeatureGate("OpenShiftPodSecurityAdmission").
 							reportProblemsToJiraComponent("auth").
 							contactPerson("ibihim").
@@ -793,19 +785,6 @@ var (
 				enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
 				mustRegister()
 
-	FeatureGateGatewayAPIController = newFeatureGate("GatewayAPIController").
-					reportProblemsToJiraComponent("Routing").
-					contactPerson("miciah").
-					productScope(ocpSpecific).
-		// Previously, the "GatewayAPI" feature gate managed both the GatewayAPI CRDs
-		// and the Gateway Controller. However, with the introduction of Gateway CRD
-		// lifecycle management (EP#1756), these responsibilities were separated.
-		// A dedicated feature gate now controls the Gateway Controller to distinguish
-		// its production readiness from that of the CRDs.
-		enhancementPR("https://github.com/openshift/enhancements/pull/1756").
-		enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
-		mustRegister()
-
 	FeatureShortCertRotation = newFeatureGate("ShortCertRotation").
 					reportProblemsToJiraComponent("kube-apiserver").
 					contactPerson("vrutkovs").
diff --git a/features/legacyfeaturegates.go b/features/legacyfeaturegates.go
@@ -33,8 +33,6 @@ var legacyFeatureGates = sets.New(
 	// never add to this list, if you think you have an exception ask @deads2k
 	"GCPClusterHostedDNS",
 	// never add to this list, if you think you have an exception ask @deads2k
-	"GatewayAPI",
-	// never add to this list, if you think you have an exception ask @deads2k
 	"HardwareSpeed",
 	// never add to this list, if you think you have an exception ask @deads2k
 	"ImageStreamImportMode",
diff --git a/payload-command/render/legacyfeaturegates.go b/payload-command/render/legacyfeaturegates.go
@@ -35,8 +35,6 @@ var legacyFeatureGates = sets.New(
 	// never add to this list, if you think you have an exception ask @deads2k
 	"GCPClusterHostedDNS",
 	// never add to this list, if you think you have an exception ask @deads2k
-	"GatewayAPI",
-	// never add to this list, if you think you have an exception ask @deads2k
 	"HardwareSpeed",
 	// never add to this list, if you think you have an exception ask @deads2k
 	"ImageStreamImportMode",
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
@@ -298,12 +298,6 @@
                     {
                         "name": "GCPClusterHostedDNSInstall"
                     },
-                    {
-                        "name": "GatewayAPI"
-                    },
-                    {
-                        "name": "GatewayAPIController"
-                    },
                     {
                         "name": "HighlyAvailableArbiter"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
@@ -219,12 +219,6 @@
                     {
                         "name": "GCPDualStackInstall"
                     },
-                    {
-                        "name": "GatewayAPI"
-                    },
-                    {
-                        "name": "GatewayAPIController"
-                    },
                     {
                         "name": "GatewayAPIWithoutOLM"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
@@ -300,12 +300,6 @@
                     {
                         "name": "GCPClusterHostedDNSInstall"
                     },
-                    {
-                        "name": "GatewayAPI"
-                    },
-                    {
-                        "name": "GatewayAPIController"
-                    },
                     {
                         "name": "HighlyAvailableArbiter"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
@@ -231,12 +231,6 @@
                     {
                         "name": "GCPDualStackInstall"
                     },
-                    {
-                        "name": "GatewayAPI"
-                    },
-                    {
-                        "name": "GatewayAPIController"
-                    },
                     {
                         "name": "GatewayAPIWithoutOLM"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
@@ -292,12 +292,6 @@
                     {
                         "name": "GCPClusterHostedDNSInstall"
                     },
-                    {
-                        "name": "GatewayAPI"
-                    },
-                    {
-                        "name": "GatewayAPIController"
-                    },
                     {
                         "name": "HighlyAvailableArbiter"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -201,12 +201,6 @@
                     {
                         "name": "GCPDualStackInstall"
                     },
-                    {
-                        "name": "GatewayAPI"
-                    },
-                    {
-                        "name": "GatewayAPIController"
-                    },
                     {
                         "name": "GatewayAPIWithoutOLM"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
@@ -294,12 +294,6 @@
                     {
                         "name": "GCPClusterHostedDNSInstall"
                     },
-                    {
-                        "name": "GatewayAPI"
-                    },
-                    {
-                        "name": "GatewayAPIController"
-                    },
                     {
                         "name": "HighlyAvailableArbiter"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -213,12 +213,6 @@
                     {
                         "name": "GCPDualStackInstall"
                     },
-                    {
-                        "name": "GatewayAPI"
-                    },
-                    {
-                        "name": "GatewayAPIController"
-                    },
                     {
                         "name": "GatewayAPIWithoutOLM"
                     },

Original file line number	Diff line number	Diff line change
`@@ -298,12 +298,6 @@`
`298`	`298`	`{`
`299`	`299`	`"name": "GCPClusterHostedDNSInstall"`
`300`	`300`	`},`
`301`		`- {`
`302`		`- "name": "GatewayAPI"`
`303`		`- },`
`304`		`- {`
`305`		`- "name": "GatewayAPIController"`
`306`		`- },`
`307`	`301`	`{`
`308`	`302`	`"name": "HighlyAvailableArbiter"`
`309`	`303`	`},`
Original file line number	Diff line number	Diff line change
`@@ -219,12 +219,6 @@`
`219`	`219`	`{`
`220`	`220`	`"name": "GCPDualStackInstall"`
`221`	`221`	`},`
`222`		`- {`
`223`		`- "name": "GatewayAPI"`
`224`		`- },`
`225`		`- {`
`226`		`- "name": "GatewayAPIController"`
`227`		`- },`
`228`	`222`	`{`
`229`	`223`	`"name": "GatewayAPIWithoutOLM"`
`230`	`224`	`},`
Original file line number	Diff line number	Diff line change
`@@ -300,12 +300,6 @@`
`300`	`300`	`{`
`301`	`301`	`"name": "GCPClusterHostedDNSInstall"`
`302`	`302`	`},`
`303`		`- {`
`304`		`- "name": "GatewayAPI"`
`305`		`- },`
`306`		`- {`
`307`		`- "name": "GatewayAPIController"`
`308`		`- },`
`309`	`303`	`{`
`310`	`304`	`"name": "HighlyAvailableArbiter"`
`311`	`305`	`},`
Original file line number	Diff line number	Diff line change
`@@ -231,12 +231,6 @@`
`231`	`231`	`{`
`232`	`232`	`"name": "GCPDualStackInstall"`
`233`	`233`	`},`
`234`		`- {`
`235`		`- "name": "GatewayAPI"`
`236`		`- },`
`237`		`- {`
`238`		`- "name": "GatewayAPIController"`
`239`		`- },`
`240`	`234`	`{`
`241`	`235`	`"name": "GatewayAPIWithoutOLM"`
`242`	`236`	`},`
Original file line number	Diff line number	Diff line change
`@@ -292,12 +292,6 @@`
`292`	`292`	`{`
`293`	`293`	`"name": "GCPClusterHostedDNSInstall"`
`294`	`294`	`},`
`295`		`- {`
`296`		`- "name": "GatewayAPI"`
`297`		`- },`
`298`		`- {`
`299`		`- "name": "GatewayAPIController"`
`300`		`- },`
`301`	`295`	`{`
`302`	`296`	`"name": "HighlyAvailableArbiter"`
`303`	`297`	`},`
Original file line number	Diff line number	Diff line change
`@@ -201,12 +201,6 @@`
`201`	`201`	`{`
`202`	`202`	`"name": "GCPDualStackInstall"`
`203`	`203`	`},`
`204`		`- {`
`205`		`- "name": "GatewayAPI"`
`206`		`- },`
`207`		`- {`
`208`		`- "name": "GatewayAPIController"`
`209`		`- },`
`210`	`204`	`{`
`211`	`205`	`"name": "GatewayAPIWithoutOLM"`
`212`	`206`	`},`