[release-4.21] WIP: Remove feature-set annotations from Sail Library RBAC Manifests by gcs278 · Pull Request #1462 · openshift/cluster-ingress-operator

gcs278 · 2026-06-04T17:10:53Z

Summary

Remove the release.openshift.io/feature-set: DevPreviewNoUpgrade,TechPreviewNoUpgrade annotation from the Sail Library ClusterRole and ClusterRoleBinding manifests. This annotation restricts CVO from deploying these RBAC resources on clusters running the Default feature set. Removing it is required before promoting the GatewayAPIWithoutOLM feature gate to GA.

Depends on #1442. Blocks openshift/api#2865 (FG promotion to Default/GA).

🤖 Generated with Claude Code

Vendor the GatewayAPIWithoutOLM in the openshift/api repo to support backporting the No OLM logic into the release-4.21 branch. go get github.com/openshift/api@1d79f30d466 go get github.com/openshift/client-go@96a6cbc1420c PR: openshift#1354

Cherry-picked from: 8a40966 openshift#1354 Conflicts resolved: - pkg/operator/operator.go: Added GatewayAPIWithoutOLM gate alongside existing 4.21 gates (GatewayAPI, GatewayAPIController, RouteExternalCertificate)

Cherry-picked from: 5617a41 openshift#1354

Cherry-picked from: ab04ca4 openshift#1354

Cherry-picked from: ed2eb36 openshift#1354 Conflicts resolved: - pkg/operator/controller/status/controller.go: Took incoming noOLM logic (useOLM/useSailLibrary, conditional subscription listing) but wrapped in existing 4.21 GatewayAPIEnabled guard. Restored GatewayAPIControllerEnabled guard that was present in the original condition but dropped during cherry-pick.

…rRole Cherry-picked from: a758d83 openshift#1354

Cherry-picked from: 9c4d792 openshift#1354 Conflicts resolved: - test/e2e/gateway_api_test.go: Kept 4.21 gatewayAPIControllerEnabled guard, added gatewayAPIWithoutOLMEnabled conditionals inside it. Kept xcrdNames alongside new istioCRDNames. Removed testCRDNames declaration since it was subsequently added to release-4.21 via PR openshift#1446. - Removed references to testGatewayAPIInfrastructureAnnotations, testGatewayAPIInternalLoadBalancer, and testGatewayOpenshiftConditions which were added in separate PRs not present on release-4.21.

Cherry-picked from: 955a5c0 openshift#1354

Cherry-picked from: 6d2c6c8 openshift#1402

Cherry-picked from: 43c978a openshift#1404 Conflicts resolved: - go.mod: Aslak's development branch introduced transitive dependencies that diverged from release-4.21. Reset go.mod to the release-4.21 baseline, then added only the openshift-service-mesh/sail-operator replace directive and bumped gateway-api to v1.4.1.

Cherry-picked from: b1bbbb7 openshift#1404

Remove the release.openshift.io/feature-set annotation from the Sail Library ClusterRole and ClusterRoleBinding so they are included in all feature sets, not just DevPreview and TechPreview. This is needed to test the noOLM path in Default/GA mode via payload jobs. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

openshift-ci · 2026-06-04T17:10:58Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

coderabbitai · 2026-06-04T17:11:02Z

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: 326d7c49-c6b5-49bb-9102-17be6cb18d53

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.}

openshift-ci · 2026-06-04T17:11:40Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign rfredette for approval. For more information see the Code Review Process.

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

Details

Needs approval from an approver in each of these files:

OWNERS

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

openshift-ci · 2026-06-04T17:40:16Z