Merge pull request #2873 from gcs278/backport-GatewayAPIWithoutOLM-TP-4.21

openshift-merge-bot[bot] · web-flow · commit 253fff21f708 · 2026-06-16T21:50:33.000Z
[release-4.21] OCPBUGS-88295, OCPBUGS-88297, OCPBUGS-82146, OCPBUGS-78330, OCPBUGS-85550: Promote GatewayAPIWithoutOLM feature gate to TechPreview
diff --git a/features.md b/features.md
@@ -3,7 +3,6 @@
 | ClientsAllowCBOR| | | | | |  |
 | ClusterAPIInstall| | | | | |  |
 | EventedPLEG| | | | | |  |
-| GatewayAPIWithoutOLM| | | | | |  |
 | MachineAPIOperatorDisableMachineHealthCheckController| | | | | |  |
 | MultiArchInstallAzure| | | | | |  |
 | NewOLMBoxCutterRuntime| | | | | |  |
@@ -48,6 +47,7 @@
 | 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>  |
diff --git a/features/features.go b/features/features.go
@@ -951,5 +951,6 @@ var (
                                     contactPerson("miciah").
                                     productScope(ocpSpecific).
                                     enhancementPR("https://github.com/openshift/enhancements/pull/1933").
+                                    enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
                                     mustRegister()
 )
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -23,9 +23,6 @@
                     {
                         "name": "EventedPLEG"
                     },
-                    {
-                        "name": "GatewayAPIWithoutOLM"
-                    },
                     {
                         "name": "MachineAPIOperatorDisableMachineHealthCheckController"
                     },
@@ -190,6 +187,9 @@
                     {
                         "name": "GatewayAPIController"
                     },
+                    {
+                        "name": "GatewayAPIWithoutOLM"
+                    },
                     {
                         "name": "HighlyAvailableArbiter"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -32,9 +32,6 @@
                     {
                         "name": "ExternalSnapshotMetadata"
                     },
-                    {
-                        "name": "GatewayAPIWithoutOLM"
-                    },
                     {
                         "name": "KMSEncryptionProvider"
                     },
@@ -196,6 +193,9 @@
                     {
                         "name": "GatewayAPIController"
                     },
+                    {
+                        "name": "GatewayAPIWithoutOLM"
+                    },
                     {
                         "name": "HighlyAvailableArbiter"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -23,9 +23,6 @@
                     {
                         "name": "EventedPLEG"
                     },
-                    {
-                        "name": "GatewayAPIWithoutOLM"
-                    },
                     {
                         "name": "HyperShiftOnlyDynamicResourceAllocation"
                     },
@@ -175,6 +172,9 @@
                     {
                         "name": "GatewayAPIController"
                     },
+                    {
+                        "name": "GatewayAPIWithoutOLM"
+                    },
                     {
                         "name": "HighlyAvailableArbiter"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -32,9 +32,6 @@
                     {
                         "name": "ExternalSnapshotMetadata"
                     },
-                    {
-                        "name": "GatewayAPIWithoutOLM"
-                    },
                     {
                         "name": "HyperShiftOnlyDynamicResourceAllocation"
                     },
@@ -181,6 +178,9 @@
                     {
                         "name": "GatewayAPIController"
                     },
+                    {
+                        "name": "GatewayAPIWithoutOLM"
+                    },
                     {
                         "name": "HighlyAvailableArbiter"
                     },

Original file line number	Diff line number	Diff line change
`@@ -951,5 +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`	`955`	`mustRegister()`
`955`	`956`	`)`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,6 @@`
`23`	`23`	`{`
`24`	`24`	`"name": "EventedPLEG"`
`25`	`25`	`},`
`26`		`- {`
`27`		`- "name": "GatewayAPIWithoutOLM"`
`28`		`- },`
`29`	`26`	`{`
`30`	`27`	`"name": "MachineAPIOperatorDisableMachineHealthCheckController"`
`31`	`28`	`},`
`@@ -190,6 +187,9 @@`
`190`	`187`	`{`
`191`	`188`	`"name": "GatewayAPIController"`
`192`	`189`	`},`
	`190`	`+ {`
	`191`	`+ "name": "GatewayAPIWithoutOLM"`
	`192`	`+ },`
`193`	`193`	`{`
`194`	`194`	`"name": "HighlyAvailableArbiter"`
`195`	`195`	`},`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,6 @@`
`32`	`32`	`{`
`33`	`33`	`"name": "ExternalSnapshotMetadata"`
`34`	`34`	`},`
`35`		`- {`
`36`		`- "name": "GatewayAPIWithoutOLM"`
`37`		`- },`
`38`	`35`	`{`
`39`	`36`	`"name": "KMSEncryptionProvider"`
`40`	`37`	`},`
`@@ -196,6 +193,9 @@`
`196`	`193`	`{`
`197`	`194`	`"name": "GatewayAPIController"`
`198`	`195`	`},`
	`196`	`+ {`
	`197`	`+ "name": "GatewayAPIWithoutOLM"`
	`198`	`+ },`
`199`	`199`	`{`
`200`	`200`	`"name": "HighlyAvailableArbiter"`
`201`	`201`	`},`