From bfe7976b2d99141bd536f142bef991ddf4e30ead Mon Sep 17 00:00:00 2001 From: Grant Spence Date: Tue, 2 Jun 2026 20:23:16 -0400 Subject: [PATCH 1/2] NE-2480: Add featuregate for GatewayAPIWithoutOLM (disabled) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport of the GatewayAPIWithoutOLM feature gate definition to release-4.19 with all feature sets disabled. This provides the gate definition so that the CIO noOLM backport can compile against it. The gate is OFF in all profiles — the Sail Library code path is present but dormant. Cherry-picked from: a47ac12888a359dda4b4af89d87e40518a55e215 Original PR: 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 982537abc2d..57f333b6072 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 c13c35f0e46..c89337b0fec 100644 --- a/features/features.go +++ b/features/features.go @@ -851,4 +851,11 @@ var ( enhancementPR("https://github.com/openshift/enhancements/pull/1748"). 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 7f412e90cbc..e07f565fa3e 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml @@ -67,6 +67,9 @@ { "name": "GCPCustomAPIEndpoints" }, + { + "name": "GatewayAPIWithoutOLM" + }, { "name": "HighlyAvailableArbiter" }, diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml index 54506182cb6..27b4bea58dd 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 48cad89ef3e..d31c5732787 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml @@ -30,6 +30,9 @@ { "name": "Example2" }, + { + "name": "GatewayAPIWithoutOLM" + }, { "name": "MachineAPIOperatorDisableMachineHealthCheckController" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml index 60a6554a328..4b349a2d524 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml @@ -70,6 +70,9 @@ { "name": "GCPCustomAPIEndpoints" }, + { + "name": "GatewayAPIWithoutOLM" + }, { "name": "HighlyAvailableArbiter" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml index 50840d95f01..9caec8b3c6a 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 243fab5616b..b4af468b230 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml @@ -30,6 +30,9 @@ { "name": "Example2" }, + { + "name": "GatewayAPIWithoutOLM" + }, { "name": "MachineAPIOperatorDisableMachineHealthCheckController" }, From c13e0b339c3fc28e8ca409a34f8d33adca81807b Mon Sep 17 00:00:00 2001 From: Grant Spence Date: Tue, 2 Jun 2026 20:24:38 -0400 Subject: [PATCH 2/2] NE-2480: Promote GatewayAPIWithoutOLM feature gate to Default Enable the GatewayAPIWithoutOLM feature gate by default on release-4.19. This activates the Sail Library installation path, replacing OLM-based Istio management for Gateway API. Co-Authored-By: Claude Opus 4.6 --- features.md | 2 +- features/features.go | 1 + .../featuregates/featureGate-Hypershift-Default.yaml | 6 +++--- .../featureGate-Hypershift-DevPreviewNoUpgrade.yaml | 6 +++--- .../featureGate-Hypershift-TechPreviewNoUpgrade.yaml | 6 +++--- .../featuregates/featureGate-SelfManagedHA-Default.yaml | 6 +++--- .../featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml | 6 +++--- .../featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml | 6 +++--- 8 files changed, 20 insertions(+), 19 deletions(-) diff --git a/features.md b/features.md index 57f333b6072..fb1e0f5ecab 100644 --- a/features.md +++ b/features.md @@ -2,7 +2,6 @@ | ------ | --- | --- | --- | --- | --- | --- | | ClusterAPIInstall| | | | | | | | EventedPLEG| | | | | | | -| GatewayAPIWithoutOLM| | | | | | | | MachineAPIOperatorDisableMachineHealthCheckController| | | | | | | | MultiArchInstallAzure| | | | | | | | ShortCertRotation| | | | | | | @@ -76,6 +75,7 @@ | GCPLabelsTags| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | GatewayAPI| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | GatewayAPIController| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | +| GatewayAPIWithoutOLM| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | HardwareSpeed| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | IngressControllerLBSubnetsAWS| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | KMSv1| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index c89337b0fec..138cc76886a 100644 --- a/features/features.go +++ b/features/features.go @@ -857,5 +857,6 @@ var ( contactPerson("miciah"). productScope(ocpSpecific). enhancementPR("https://github.com/openshift/enhancements/pull/1933"). + 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 index e07f565fa3e..5834fb12b0a 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml @@ -67,9 +67,6 @@ { "name": "GCPCustomAPIEndpoints" }, - { - "name": "GatewayAPIWithoutOLM" - }, { "name": "HighlyAvailableArbiter" }, @@ -243,6 +240,9 @@ { "name": "GatewayAPIController" }, + { + "name": "GatewayAPIWithoutOLM" + }, { "name": "HardwareSpeed" }, diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml index 27b4bea58dd..265afa98cc2 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" }, @@ -143,6 +140,9 @@ { "name": "GatewayAPIController" }, + { + "name": "GatewayAPIWithoutOLM" + }, { "name": "HardwareSpeed" }, diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml index d31c5732787..0082e849343 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml @@ -30,9 +30,6 @@ { "name": "Example2" }, - { - "name": "GatewayAPIWithoutOLM" - }, { "name": "MachineAPIOperatorDisableMachineHealthCheckController" }, @@ -152,6 +149,9 @@ { "name": "GatewayAPIController" }, + { + "name": "GatewayAPIWithoutOLM" + }, { "name": "HardwareSpeed" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml index 4b349a2d524..0d4ae67494c 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml @@ -70,9 +70,6 @@ { "name": "GCPCustomAPIEndpoints" }, - { - "name": "GatewayAPIWithoutOLM" - }, { "name": "HighlyAvailableArbiter" }, @@ -240,6 +237,9 @@ { "name": "GatewayAPIController" }, + { + "name": "GatewayAPIWithoutOLM" + }, { "name": "HardwareSpeed" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml index 9caec8b3c6a..a4f8470e2b4 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" }, @@ -131,6 +128,9 @@ { "name": "GatewayAPIController" }, + { + "name": "GatewayAPIWithoutOLM" + }, { "name": "HardwareSpeed" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml index b4af468b230..ad72bf1dcfe 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml @@ -30,9 +30,6 @@ { "name": "Example2" }, - { - "name": "GatewayAPIWithoutOLM" - }, { "name": "MachineAPIOperatorDisableMachineHealthCheckController" }, @@ -140,6 +137,9 @@ { "name": "GatewayAPIController" }, + { + "name": "GatewayAPIWithoutOLM" + }, { "name": "HardwareSpeed" },