[release-4.21] OCPBUGS-85149: Backport GatewayAPIWithoutOLM feature gate as disabled

[gcs278]

Summary

Backport the GatewayAPIWithoutOLM feature gate definition to release-4.21 with all feature sets disabled. The gate is present but OFF — no behavioral change.

Why

1. Unblocks test backports — openshift/origin#31139 needs the feature gate to exist so it can conditionally skip noOLM-dependent tests. Without the gate definition, the test backport can't compile.

2. Enables cleaner future backports — there is ongoing discussion about backporting the full noOLM / Sail Library path to 4.21 to address OLM subscription management issues (catalog source conflicts, detached subscriptions, disconnected cluster support). Having the gate already present makes that backport significantly cleaner if we decide to proceed.

Either way, this PR is safe — the gate is disabled in all feature sets and introduces no functional change.

Changes

• Add FeatureGateGatewayAPIWithoutOLM to features/features.go with no enableIn call (disabled everywhere)

[openshift-merge-bot]

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

[openshift-ci-robot]

@gcs278: This pull request references Jira Issue OCPBUGS-85149, which is valid.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.21.z) matches configured target version for branch (4.21.z)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
• release note type set to "Release Note Not Required"
• dependent bug Jira Issue OCPBUGS-85148 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-85148 targets the "4.22.0" version, which is one of the valid target versions: 4.22.0
• bug has dependents

Requesting review from QA contact:
/cc @melvinjoseph86

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Summary

Backport the GatewayAPIWithoutOLM feature gate definition to release-4.21 with all feature sets disabled. The gate is present but OFF — no behavioral change.

Why

1. Unblocks test backports — openshift/origin#31139 needs the feature gate to exist so it can conditionally skip noOLM-dependent tests. Without the gate definition, the test backport can't compile.

2. Enables cleaner future backports — there is ongoing discussion about backporting the full noOLM / Sail Library path to 4.21 to address OLM subscription management issues (catalog source conflicts, detached subscriptions, disconnected cluster support). Having the gate already present makes that backport significantly cleaner if we decide to proceed.

Either way, this PR is safe — the gate is disabled in all feature sets and introduces no functional change.

Changes

• Add FeatureGateGatewayAPIWithoutOLM to features/features.go with no enableIn call (disabled everywhere)
• Regenerated payload feature gate manifests via make update-payload-featuregates — the original cherry-pick produced a dirty merge with unrelated feature gates from master; the regeneration ensures only GatewayAPIWithoutOLM is added cleanly against the 4.21 baseline (separate commit)

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci]

Hello @gcs278! Some important instructions when contributing to openshift/api:
API design plays an important part in the user experience of OpenShift and as such API PRs are subject to a high level of scrutiny to ensure they follow our best practices. If you haven't already done so, please review the OpenShift API Conventions and ensure that your proposed changes are compliant. Following these conventions will help expedite the api review process for your PR.

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 90bda70f-25dd-49d2-8870-6a0d74b33c10

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[melvinjoseph86]

Created a cluster with this PR and openshift/cluster-ingress-operator#1437 and openshift/origin#31139

➜ Oc get infrastructure cluster -o=jsonpath={.spec.platformSpec.type} VSphere% ➜ oc get clusterversion
NAME VERSION AVAILABLE PROGRESSING SINCE STATUS
version 4.21.0-0-2026-06-02-035039-test-ci-ln-n7bv2tk-latest True False 149m Cluster version is 4.21.0-0-2026-06-02-035039-test-ci-ln-n7bv2tk-latest
➜ oc get featuregate cluster -o yaml
apiVersion: config.openshift.io/v1
kind: FeatureGate
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
creationTimestamp: "2026-06-02T04:01:58Z"
generation: 1
name: cluster
resourceVersion: "700"
uid: 2cae3fb6-9d4f-476e-9769-397a2af161c1
spec: {}
status:
featureGates:
- disabled:
- name: AWSClusterHostedDNS
- name: AWSClusterHostedDNSInstall
- name: AWSDedicatedHosts
- name: AWSDualStackInstall
- name: AWSServiceLBNetworkSecurityGroup
- name: AutomatedEtcdBackup
- name: AzureClusterHostedDNSInstall
- name: AzureDedicatedHosts
- name: AzureDualStackInstall
- name: AzureMultiDisk
- name: BootImageSkewEnforcement
- name: BootcNodeManagement
- name: CBORServingAndStorage
- name: CRDCompatibilityRequirementOperator
- name: ClientsAllowCBOR
- name: ClientsPreferCBOR
- name: ClusterAPIInstall
- name: ClusterAPIInstallIBMCloud
- name: ClusterAPIMachineManagement
- name: ClusterAPIMachineManagementVSphere
- name: ClusterMonitoringConfig
- name: ClusterVersionOperatorConfiguration
- name: DNSNameResolver
- name: DualReplica
- name: DyanmicServiceEndpointIBMCloud
- name: EtcdBackendQuota
- name: EventedPLEG
- name: Example
- name: Example2
- name: ExternalSnapshotMetadata
- name: GCPClusterHostedDNS
- name: GCPCustomAPIEndpoints
- name: GCPCustomAPIEndpointsInstall
- name: GCPDualStackInstall
- name: GatewayAPIWithoutOLM
- name: HyperShiftOnlyDynamicResourceAllocation
<-----snip---->

/verified by @mjoseph

[openshift-ci-robot]

@melvinjoseph86: This PR has been marked as verified by @mjoseph.

Details

In response to this:

Created a cluster with this PR and openshift/cluster-ingress-operator#1437 and openshift/origin#31139

➜ Oc get infrastructure cluster -o=jsonpath={.spec.platformSpec.type} VSphere% ➜ oc get clusterversion
NAME VERSION AVAILABLE PROGRESSING SINCE STATUS
version 4.21.0-0-2026-06-02-035039-test-ci-ln-n7bv2tk-latest True False 149m Cluster version is 4.21.0-0-2026-06-02-035039-test-ci-ln-n7bv2tk-latest
➜ oc get featuregate cluster -o yaml
apiVersion: config.openshift.io/v1
kind: FeatureGate
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
creationTimestamp: "2026-06-02T04:01:58Z"
generation: 1
name: cluster
resourceVersion: "700"
uid: 2cae3fb6-9d4f-476e-9769-397a2af161c1
spec: {}
status:
featureGates:
- disabled:
- name: AWSClusterHostedDNS
- name: AWSClusterHostedDNSInstall
- name: AWSDedicatedHosts
- name: AWSDualStackInstall
- name: AWSServiceLBNetworkSecurityGroup
- name: AutomatedEtcdBackup
- name: AzureClusterHostedDNSInstall
- name: AzureDedicatedHosts
- name: AzureDualStackInstall
- name: AzureMultiDisk
- name: BootImageSkewEnforcement
- name: BootcNodeManagement
- name: CBORServingAndStorage
- name: CRDCompatibilityRequirementOperator
- name: ClientsAllowCBOR
- name: ClientsPreferCBOR
- name: ClusterAPIInstall
- name: ClusterAPIInstallIBMCloud
- name: ClusterAPIMachineManagement
- name: ClusterAPIMachineManagementVSphere
- name: ClusterMonitoringConfig
- name: ClusterVersionOperatorConfiguration
- name: DNSNameResolver
- name: DualReplica
- name: DyanmicServiceEndpointIBMCloud
- name: EtcdBackendQuota
- name: EventedPLEG
- name: Example
- name: Example2
- name: ExternalSnapshotMetadata
- name: GCPClusterHostedDNS
- name: GCPCustomAPIEndpoints
- name: GCPCustomAPIEndpointsInstall
- name: GCPDualStackInstall
- name: GatewayAPIWithoutOLM
- name: HyperShiftOnlyDynamicResourceAllocation
<-----snip---->

/verified by @mjoseph

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[JoelSpeed]

/lgtm
/label backport-risk-assessed

[openshift-merge-bot]

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aws-ovn
/test e2e-aws-ovn-hypershift
/test e2e-aws-ovn-hypershift-conformance
/test e2e-aws-ovn-techpreview
/test e2e-aws-serial-1of2
/test e2e-aws-serial-2of2
/test e2e-aws-serial-techpreview-1of2
/test e2e-aws-serial-techpreview-2of2
/test e2e-azure
/test e2e-gcp
/test e2e-upgrade
/test e2e-upgrade-out-of-change

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [JoelSpeed]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-ci-robot]

@gcs278: This pull request references Jira Issue OCPBUGS-85149, which is valid.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.21.z) matches configured target version for branch (4.21.z)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
• release note type set to "Release Note Not Required"
• dependent bug Jira Issue OCPBUGS-85148 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-85148 targets the "4.22.0" version, which is one of the valid target versions: 4.22.0
• bug has dependents

Requesting review from QA contact:
/cc @melvinjoseph86

Details

In response to this:

Summary

Backport the GatewayAPIWithoutOLM feature gate definition to release-4.21 with all feature sets disabled. The gate is present but OFF — no behavioral change.

Why

1. Unblocks test backports — openshift/origin#31139 needs the feature gate to exist so it can conditionally skip noOLM-dependent tests. Without the gate definition, the test backport can't compile.

2. Enables cleaner future backports — there is ongoing discussion about backporting the full noOLM / Sail Library path to 4.21 to address OLM subscription management issues (catalog source conflicts, detached subscriptions, disconnected cluster support). Having the gate already present makes that backport significantly cleaner if we decide to proceed.

Either way, this PR is safe — the gate is disabled in all feature sets and introduces no functional change.

Changes

• Add FeatureGateGatewayAPIWithoutOLM to features/features.go with no enableIn call (disabled everywhere)

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-merge-bot]

/retest-required

Remaining retests: 0 against base HEAD b66d756 and 2 for PR HEAD 4b25e2d in total

[openshift-ci]

@gcs278: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

[openshift-ci-robot]

@gcs278: Jira Issue OCPBUGS-85149: Some pull requests linked via external trackers have merged:

The following pull request, linked via external tracker, has not merged:

• openshift/cluster-ingress-operator#1437 is open

All associated pull requests must be merged or unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-85149 has not been moved to the MODIFIED state.

This PR is marked as verified. If the remaining PRs listed above are marked as verified before merging, the issue will automatically be moved to VERIFIED after all of the changes from the PRs are available in an accepted nightly payload.

Details

In response to this:

Summary

Backport the GatewayAPIWithoutOLM feature gate definition to release-4.21 with all feature sets disabled. The gate is present but OFF — no behavioral change.

Why

1. Unblocks test backports — openshift/origin#31139 needs the feature gate to exist so it can conditionally skip noOLM-dependent tests. Without the gate definition, the test backport can't compile.

2. Enables cleaner future backports — there is ongoing discussion about backporting the full noOLM / Sail Library path to 4.21 to address OLM subscription management issues (catalog source conflicts, detached subscriptions, disconnected cluster support). Having the gate already present makes that backport significantly cleaner if we decide to proceed.

Either way, this PR is safe — the gate is disabled in all feature sets and introduces no functional change.

Changes

• Add FeatureGateGatewayAPIWithoutOLM to features/features.go with no enableIn call (disabled everywhere)

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-merge-robot]

Fix included in release 4.21.0-0.nightly-2026-06-04-211014