From 30108b30820ad9210ce4c6aa00d1b4264743a101 Mon Sep 17 00:00:00 2001 From: Grant Spence Date: Tue, 2 Jun 2026 20:40:18 -0400 Subject: [PATCH 1/2] OCPBUGS-85149: Backport GatewayAPIWithoutOLM feature gate as disabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add the GatewayAPIWithoutOLM feature gate to release-4.20 with all feature sets disabled. No behavioral change — the gate is present but OFF. Unblocks cleaner backports of noOLM-dependent code and tests. Cherry-picked from: a47ac12888a359dda4b4af89d87e40518a55e215 https://github.com/openshift/api/pull/2191 Co-Authored-By: Claude Opus 4.6 --- features.md | 1 + features/features.go | 7 +++++++ .../featuregates/featureGate-Hypershift-Default.yaml | 3 +++ .../featureGate-Hypershift-DevPreviewNoUpgrade.yaml | 3 +++ .../featureGate-Hypershift-TechPreviewNoUpgrade.yaml | 3 +++ .../featuregates/featureGate-SelfManagedHA-Default.yaml | 3 +++ .../featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml | 3 +++ .../featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml | 3 +++ 8 files changed, 26 insertions(+) diff --git a/features.md b/features.md index 792c55505b5..946082f5069 100644 --- a/features.md +++ b/features.md @@ -2,6 +2,7 @@ | ------ | --- | --- | --- | --- | --- | --- | | ClusterAPIInstall| | | | | | | | EventedPLEG| | | | | | | +| GatewayAPIWithoutOLM| | | | | | | | MachineAPIOperatorDisableMachineHealthCheckController| | | | | | | | MultiArchInstallAzure| | | | | | | | ShortCertRotation| | | | | | | diff --git a/features/features.go b/features/features.go index c555d650fd8..db366cb3a83 100644 --- a/features/features.go +++ b/features/features.go @@ -846,4 +846,11 @@ var ( enhancementPR("https://github.com/openshift/enhancements/pull/1785"). enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade). mustRegister() + + FeatureGateGatewayAPIWithoutOLM = newFeatureGate("GatewayAPIWithoutOLM"). + reportProblemsToJiraComponent("Routing"). + contactPerson("miciah"). + productScope(ocpSpecific). + enhancementPR("https://github.com/openshift/enhancements/pull/1933"). + mustRegister() ) diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml index ff661fd398f..f1b00707d81 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml @@ -94,6 +94,9 @@ { "name": "GCPCustomAPIEndpointsInstall" }, + { + "name": "GatewayAPIWithoutOLM" + }, { "name": "ImageModeStatusReporting" }, diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml index 4bda8c655cc..92c2e7b6075 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml @@ -21,6 +21,9 @@ { "name": "EventedPLEG" }, + { + "name": "GatewayAPIWithoutOLM" + }, { "name": "MachineAPIOperatorDisableMachineHealthCheckController" }, diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml index b2a922dbba3..5dd10f60d10 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml @@ -30,6 +30,9 @@ { "name": "ExternalSnapshotMetadata" }, + { + "name": "GatewayAPIWithoutOLM" + }, { "name": "MachineAPIOperatorDisableMachineHealthCheckController" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml index 239c3e0389f..09233fdd09b 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml @@ -94,6 +94,9 @@ { "name": "GCPCustomAPIEndpointsInstall" }, + { + "name": "GatewayAPIWithoutOLM" + }, { "name": "ImageModeStatusReporting" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml index 5b5a5a99a31..3cd8f1a8717 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml @@ -21,6 +21,9 @@ { "name": "EventedPLEG" }, + { + "name": "GatewayAPIWithoutOLM" + }, { "name": "MachineAPIOperatorDisableMachineHealthCheckController" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml index 6ae25223ecb..0f6f897db7e 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml @@ -30,6 +30,9 @@ { "name": "ExternalSnapshotMetadata" }, + { + "name": "GatewayAPIWithoutOLM" + }, { "name": "MachineAPIOperatorDisableMachineHealthCheckController" }, From 37cdf46ce6514184cec7989dc50115e65fff3b40 Mon Sep 17 00:00:00 2001 From: Grant Spence Date: Wed, 3 Jun 2026 17:23:12 -0400 Subject: [PATCH 2/2] [release-4.20] NE-2480: Promote GatewayAPIWithoutOLM feature gate to TechPreview Enable the GatewayAPIWithoutOLM feature gate in DevPreviewNoUpgrade and TechPreviewNoUpgrade feature sets to allow CI soak before GA promotion. --- features.md | 2 +- features/features.go | 1 + .../featureGate-Hypershift-DevPreviewNoUpgrade.yaml | 6 +++--- .../featureGate-Hypershift-TechPreviewNoUpgrade.yaml | 6 +++--- .../featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml | 6 +++--- .../featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml | 6 +++--- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/features.md b/features.md index 946082f5069..d25c7f3a490 100644 --- a/features.md +++ b/features.md @@ -2,7 +2,6 @@ | ------ | --- | --- | --- | --- | --- | --- | | ClusterAPIInstall| | | | | | | | EventedPLEG| | | | | | | -| GatewayAPIWithoutOLM| | | | | | | | MachineAPIOperatorDisableMachineHealthCheckController| | | | | | | | MultiArchInstallAzure| | | | | | | | ShortCertRotation| | | | | | | @@ -38,6 +37,7 @@ | GCPClusterHostedDNSInstall| | | Enabled | Enabled | Enabled | Enabled | | GCPCustomAPIEndpoints| | | Enabled | Enabled | Enabled | Enabled | | GCPCustomAPIEndpointsInstall| | | Enabled | Enabled | Enabled | Enabled | +| GatewayAPIWithoutOLM| | | Enabled | Enabled | Enabled | Enabled | | ImageModeStatusReporting| | | Enabled | Enabled | Enabled | Enabled | | ImageStreamImportMode| | | Enabled | Enabled | Enabled | Enabled | | IngressControllerDynamicConfigurationManager| | | Enabled | Enabled | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index db366cb3a83..f4b105cd9ab 100644 --- a/features/features.go +++ b/features/features.go @@ -852,5 +852,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 index 92c2e7b6075..9ec92277b1e 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml @@ -21,9 +21,6 @@ { "name": "EventedPLEG" }, - { - "name": "GatewayAPIWithoutOLM" - }, { "name": "MachineAPIOperatorDisableMachineHealthCheckController" }, @@ -161,6 +158,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 index 5dd10f60d10..cfc96cfd897 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml @@ -30,9 +30,6 @@ { "name": "ExternalSnapshotMetadata" }, - { - "name": "GatewayAPIWithoutOLM" - }, { "name": "MachineAPIOperatorDisableMachineHealthCheckController" }, @@ -164,6 +161,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 index 3cd8f1a8717..86aaa381b36 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml @@ -21,9 +21,6 @@ { "name": "EventedPLEG" }, - { - "name": "GatewayAPIWithoutOLM" - }, { "name": "MachineAPIOperatorDisableMachineHealthCheckController" }, @@ -143,6 +140,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 index 0f6f897db7e..20cdbe66166 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml @@ -30,9 +30,6 @@ { "name": "ExternalSnapshotMetadata" }, - { - "name": "GatewayAPIWithoutOLM" - }, { "name": "MachineAPIOperatorDisableMachineHealthCheckController" }, @@ -146,6 +143,9 @@ { "name": "GatewayAPIController" }, + { + "name": "GatewayAPIWithoutOLM" + }, { "name": "HighlyAvailableArbiter" },