diff --git a/features.md b/features.md
index e237ef4fd3c..8823e1788af 100644
--- a/features.md
+++ b/features.md
@@ -93,8 +93,6 @@
| ExternalOIDC| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| ExternalOIDCWithUIDAndExtraClaimMappings| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| GCPClusterHostedDNSInstall| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
-| GatewayAPI| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
-| GatewayAPIController| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| HighlyAvailableArbiter| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| ImageStreamImportMode| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| ImageVolume| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
diff --git a/features/features.go b/features/features.go
index acb93316d62..e9ed35d0797 100644
--- 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").
@@ -778,19 +770,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
index a92c0b9bb90..a82089b9f72 100644
--- 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
index f54d17936e7..a663eb1fb60 100644
--- 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
index 90f818bec58..60205aa509c 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
@@ -292,12 +292,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
index 9bcda4a7096..0aa970decd2 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
@@ -216,12 +216,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
index 6df25ac18d1..757b6e1c532 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
@@ -294,12 +294,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
index bc55ad2ce29..dfd65489ce6 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
@@ -225,12 +225,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
index 7d1d8d1c3cb..42dfc58ff48 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
@@ -286,12 +286,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
index fad03aa971d..0e6d6aeee7e 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -198,12 +198,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
index 186da992692..21d75ad87f7 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
@@ -288,12 +288,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
index dd5abe547a9..18da54ef6db 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -207,12 +207,6 @@
{
"name": "GCPDualStackInstall"
},
- {
- "name": "GatewayAPI"
- },
- {
- "name": "GatewayAPIController"
- },
{
"name": "GatewayAPIWithoutOLM"
},