Merge pull request #2865 from gcs278/backport-GatewayAPIWithoutOLM-4.21

openshift-merge-bot[bot] · web-flow · commit 876752f4da3e · 2026-06-24T16:21:24.000Z
[release-4.21] OCPBUGS-88295, OCPBUGS-88297, OCPBUGS-82146, OCPBUGS-78330, OCPBUGS-85550: NE-2480: Promote GatewayAPIWithoutOLM feature gate to Default
diff --git a/features.md b/features.md
@@ -47,7 +47,6 @@
 | 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>  |
 | GCPCustomAPIEndpointsInstall| | | <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>  |
 | GCPDualStackInstall| | | <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>  |
-| GatewayAPIWithoutOLM| | | <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>  |
 | ImageModeStatusReporting| | | <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>  |
 | IngressControllerDynamicConfigurationManager| | | <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>  |
 | InsightsConfig| | | <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>  |
@@ -87,6 +86,7 @@
 | 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>  |
 | 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>  |
 | 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>  |
+| GatewayAPIWithoutOLM| <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>  |
 | 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>  |
 | 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>  |
diff --git a/features/features.go b/features/features.go
@@ -951,6 +951,6 @@ var (
                                     contactPerson("miciah").
                                     productScope(ocpSpecific).
                                     enhancementPR("https://github.com/openshift/enhancements/pull/1933").
-                                    enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+                                    enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default).
                                     mustRegister()
 )
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -114,9 +114,6 @@
                     {
                         "name": "GCPDualStackInstall"
                     },
-                    {
-                        "name": "GatewayAPIWithoutOLM"
-                    },
                     {
                         "name": "ImageModeStatusReporting"
                     },
@@ -272,6 +269,9 @@
                     {
                         "name": "GatewayAPIController"
                     },
+                    {
+                        "name": "GatewayAPIWithoutOLM"
+                    },
                     {
                         "name": "HighlyAvailableArbiter"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -114,9 +114,6 @@
                     {
                         "name": "GCPDualStackInstall"
                     },
-                    {
-                        "name": "GatewayAPIWithoutOLM"
-                    },
                     {
                         "name": "HyperShiftOnlyDynamicResourceAllocation"
                     },
@@ -269,6 +266,9 @@
                     {
                         "name": "GatewayAPIController"
                     },
+                    {
+                        "name": "GatewayAPIWithoutOLM"
+                    },
                     {
                         "name": "HighlyAvailableArbiter"
                     },

Original file line number	Diff line number	Diff line change
`@@ -951,6 +951,6 @@ var (`
`951`	`951`	`contactPerson("miciah").`
`952`	`952`	`productScope(ocpSpecific).`
`953`	`953`	`enhancementPR("https://github.com/openshift/enhancements/pull/1933").`
`954`		`- enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).`
	`954`	`+ enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default).`
`955`	`955`	`mustRegister()`
`956`	`956`	`)`
Original file line number	Diff line number	Diff line change
`@@ -114,9 +114,6 @@`
`114`	`114`	`{`
`115`	`115`	`"name": "GCPDualStackInstall"`
`116`	`116`	`},`
`117`		`- {`
`118`		`- "name": "GatewayAPIWithoutOLM"`
`119`		`- },`
`120`	`117`	`{`
`121`	`118`	`"name": "ImageModeStatusReporting"`
`122`	`119`	`},`
`@@ -272,6 +269,9 @@`
`272`	`269`	`{`
`273`	`270`	`"name": "GatewayAPIController"`
`274`	`271`	`},`
	`272`	`+ {`
	`273`	`+ "name": "GatewayAPIWithoutOLM"`
	`274`	`+ },`
`275`	`275`	`{`
`276`	`276`	`"name": "HighlyAvailableArbiter"`
`277`	`277`	`},`