[release-4.20] OCPBUGS-92038, OCPBUGS-92039, OCPBUGS-82147, OCPBUGS-92041, OCPBUGS-92042: Remove feature-set annotations from Sail Library RBAC Manifests

[gcs278]

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 #1459. Blocks openshift/api#2869 (FG promotion to Default/GA).

Why this annotation needs to be removed in 4.20

On 4.22, #1393 switched the Sail Library RBAC manifests from the release.openshift.io/feature-set annotation to the release.openshift.io/feature-gate annotation, which allows CVO to gate manifest deployment on individual feature gates rather than entire feature sets. However, CVO on 4.20 does not support the release.openshift.io/feature-gate annotation — openshift/cluster-version-operator#1273 was not backported.

As a result, the 4.20 backport #1459 uses the release.openshift.io/feature-set annotation instead, which gates the RBAC manifests behind TechPreviewNoUpgrade. This PR removes that annotation so the RBAC is deployed on Default clusters, which is required before promoting the feature gate to GA.

🤖 Generated with Claude Code

[openshift-ci]

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]

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: 4fbbfcc5-3a01-49e4-b8b4-6654a0b41201

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

[openshift-ci-robot]

@gcs278: This pull request references Jira Issue OCPBUGS-88295, which is invalid:

• expected the bug to target either version "4.20." or "openshift-4.20.", but it targets "4.21.z" instead
• expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Verified instead
• expected dependent Jira Issue OCPBUGS-86778 to target a version in 4.21.0, 4.21.z, but it targets "4.22.0" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

This pull request references Jira Issue OCPBUGS-88297, which is invalid:

• expected the bug to target either version "4.20." or "openshift-4.20.", but it targets "4.21.z" instead
• expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Verified instead
• expected dependent Jira Issue OCPBUGS-79467 to target a version in 4.21.0, 4.21.z, but it targets "4.22.0" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

This pull request references Jira Issue OCPBUGS-82146, which is invalid:

• expected the bug to target either version "4.20." or "openshift-4.20.", but it targets "4.21.z" instead
• expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Verified instead
• expected Jira Issue OCPBUGS-82146 to depend on a bug targeting a version in 4.21.0, 4.21.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

This pull request references Jira Issue OCPBUGS-78330, which is invalid:

• expected the bug to target either version "4.20." or "openshift-4.20.", but it targets "4.21.z" instead
• expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Verified instead
• expected dependent Jira Issue OCPBUGS-88300 to target a version in 4.21.0, 4.21.z, but it targets "4.22.0" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

This pull request references Jira Issue OCPBUGS-85550, which is invalid:

• expected the bug to target either version "4.20." or "openshift-4.20.", but it targets "4.21.z" instead
• expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Verified instead
• expected dependent Jira Issue OCPBUGS-88302 to target a version in 4.21.0, 4.21.z, but it targets "4.22.0" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

Details

In response to this:

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 #1459. Blocks openshift/api#2869 (FG promotion to Default/GA).

Why this annotation needs to be removed in 4.20

On 4.22, #1393 switched the Sail Library RBAC manifests from the release.openshift.io/feature-set annotation to the release.openshift.io/feature-gate annotation, which allows CVO to gate manifest deployment on individual feature gates rather than entire feature sets. However, CVO on 4.20 does not support the release.openshift.io/feature-gate annotation — openshift/cluster-version-operator#1273 was not backported.

As a result, the 4.20 backport #1459 uses the release.openshift.io/feature-set annotation instead, which gates the RBAC manifests behind TechPreviewNoUpgrade. This PR removes that annotation so the RBAC is deployed on Default clusters, which is required before promoting the feature gate to GA.

🤖 Generated with Claude Code

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.

[gcs278]

/jira refresh

[openshift-ci-robot]

@gcs278: This pull request references Jira Issue OCPBUGS-88295, which is invalid:

• expected the bug to be open, but it isn't
• expected the bug to target either version "4.20." or "openshift-4.20.", but it targets "4.21.z" instead
• expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Closed (Done) instead
• expected dependent Jira Issue OCPBUGS-86778 to target a version in 4.21.0, 4.21.z, but it targets "4.22.0" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

This pull request references Jira Issue OCPBUGS-88297, which is invalid:

• expected the bug to be open, but it isn't
• expected the bug to target either version "4.20." or "openshift-4.20.", but it targets "4.21.z" instead
• expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Closed (Done) instead
• expected dependent Jira Issue OCPBUGS-79467 to target a version in 4.21.0, 4.21.z, but it targets "4.22.0" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

This pull request references Jira Issue OCPBUGS-82146, which is invalid:

• expected the bug to be open, but it isn't
• expected the bug to target either version "4.20." or "openshift-4.20.", but it targets "4.21.z" instead
• expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Closed (Done) instead
• expected Jira Issue OCPBUGS-82146 to depend on a bug targeting a version in 4.21.0, 4.21.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

This pull request references Jira Issue OCPBUGS-78330, which is invalid:

• expected the bug to be open, but it isn't
• expected the bug to target either version "4.20." or "openshift-4.20.", but it targets "4.21.z" instead
• expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Closed (Done) instead
• expected dependent Jira Issue OCPBUGS-88300 to target a version in 4.21.0, 4.21.z, but it targets "4.22.0" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

This pull request references Jira Issue OCPBUGS-85550, which is invalid:

• expected the bug to be open, but it isn't
• expected the bug to target either version "4.20." or "openshift-4.20.", but it targets "4.21.z" instead
• expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Closed (Done) instead
• expected dependent Jira Issue OCPBUGS-88302 to target a version in 4.21.0, 4.21.z, but it targets "4.22.0" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

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-robot]

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

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.20.z) matches configured target version for branch (4.20.z)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
• release note text is set and does not match the template
• dependent bug Jira Issue OCPBUGS-88295 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-88295 targets the "4.21.z" version, which is one of the valid target versions: 4.21.0, 4.21.z
• 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.

This pull request references Jira Issue OCPBUGS-92039, which is valid.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.20.z) matches configured target version for branch (4.20.z)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
• release note text is set and does not match the template
• dependent bug Jira Issue OCPBUGS-88297 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-88297 targets the "4.21.z" version, which is one of the valid target versions: 4.21.0, 4.21.z
• bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (iamin@redhat.com), skipping review request.

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

This pull request references Jira Issue OCPBUGS-82147, which is valid.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.20.z) matches configured target version for branch (4.20.z)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
• release note text is set and does not match the template
• dependent bug Jira Issue OCPBUGS-82146 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-82146 targets the "4.21.z" version, which is one of the valid target versions: 4.21.0, 4.21.z
• bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (iamin@redhat.com), skipping review request.

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

This pull request references Jira Issue OCPBUGS-92041, which is valid.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.20.z) matches configured target version for branch (4.20.z)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
• release note text is set and does not match the template
• dependent bug Jira Issue OCPBUGS-78330 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-78330 targets the "4.21.z" version, which is one of the valid target versions: 4.21.0, 4.21.z
• bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (iamin@redhat.com), skipping review request.

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

This pull request references Jira Issue OCPBUGS-92042, which is valid.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.20.z) matches configured target version for branch (4.20.z)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
• release note text is set and does not match the template
• dependent bug Jira Issue OCPBUGS-85550 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-85550 targets the "4.21.z" version, which is one of the valid target versions: 4.21.0, 4.21.z
• 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

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 #1459. Blocks openshift/api#2869 (FG promotion to Default/GA).

Why this annotation needs to be removed in 4.20

On 4.22, #1393 switched the Sail Library RBAC manifests from the release.openshift.io/feature-set annotation to the release.openshift.io/feature-gate annotation, which allows CVO to gate manifest deployment on individual feature gates rather than entire feature sets. However, CVO on 4.20 does not support the release.openshift.io/feature-gate annotation — openshift/cluster-version-operator#1273 was not backported.

As a result, the 4.20 backport #1459 uses the release.openshift.io/feature-set annotation instead, which gates the RBAC manifests behind TechPreviewNoUpgrade. This PR removes that annotation so the RBAC is deployed on Default clusters, which is required before promoting the feature gate to GA.

🤖 Generated with Claude Code

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.

[rikatz]

/lgtm
/approve
done

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rikatz

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 [rikatz]

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

[gcs278]

/retest

[rhamini3]

confirmed that both the feature-set annotations are removed from the respective clusterroles in a 4.20 cluster

% oc get clusterrole openshift-ingress-operator-sail-library -ojsonpath={.metadata.annotations}
{"capability.openshift.io/name":"Ingress","include.release.openshift.io/ibm-cloud-managed":"true","include.release.openshift.io/self-managed-high-availability":"true","include.release.openshift.io/single-node-developer":"true"}%       
                                                                                                                             
 % oc get clusterrole openshift-ingress-operator-sail-library -ojsonpath={.metadata.annotations}
{"capability.openshift.io/name":"Ingress","include.release.openshift.io/ibm-cloud-managed":"true","include.release.openshift.io/self-managed-high-availability":"true","include.release.openshift.io/single-node-developer":"true"}% 

/verified by @rhamini3

[openshift-ci-robot]

@rhamini3: This PR has been marked as verified by @rhamini3.

Details

In response to this:

confirmed that both the feature-set annotations are removed from the respective clusterroles in a 4.20 cluster

% oc get clusterrole openshift-ingress-operator-sail-library -ojsonpath={.metadata.annotations}
{"capability.openshift.io/name":"Ingress","include.release.openshift.io/ibm-cloud-managed":"true","include.release.openshift.io/self-managed-high-availability":"true","include.release.openshift.io/single-node-developer":"true"}%       
                                                                                                                            
% oc get clusterrole openshift-ingress-operator-sail-library -ojsonpath={.metadata.annotations}
{"capability.openshift.io/name":"Ingress","include.release.openshift.io/ibm-cloud-managed":"true","include.release.openshift.io/self-managed-high-availability":"true","include.release.openshift.io/single-node-developer":"true"}% 

/verified by @rhamini3

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.

[candita]

This is a prerequisite for promoting the noOLM backport to GA. It broadens the CIO's RBAC permissions, but has no functional impact until openshift/api#2869 merges and activates the Sail Library code path.

/label backport-risk-assessed

[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-92038: Some pull requests linked via external trackers have merged:

• openshift/origin#31322
• openshift/cluster-ingress-operator#1459
• openshift/api#2874

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

• openshift/api#2869 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-92038 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.

Jira Issue OCPBUGS-92039: Some pull requests linked via external trackers have merged:

• openshift/origin#31322
• openshift/cluster-ingress-operator#1459
• openshift/api#2874

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

• openshift/api#2869 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-92039 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.

Jira Issue OCPBUGS-82147: Some pull requests linked via external trackers have merged:

• openshift/cluster-ingress-operator#1459
• openshift/origin#31322
• openshift/api#2874

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

• openshift/api#2869 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-82147 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.

Jira Issue OCPBUGS-92041: Some pull requests linked via external trackers have merged:

• openshift/origin#31322
• openshift/cluster-ingress-operator#1459
• openshift/api#2874

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

• openshift/api#2869 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-92041 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.

Jira Issue OCPBUGS-92042: Some pull requests linked via external trackers have merged:

• openshift/origin#31322
• openshift/cluster-ingress-operator#1459
• openshift/api#2874

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

• openshift/api#2869 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-92042 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

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 #1459. Blocks openshift/api#2869 (FG promotion to Default/GA).

Why this annotation needs to be removed in 4.20

On 4.22, #1393 switched the Sail Library RBAC manifests from the release.openshift.io/feature-set annotation to the release.openshift.io/feature-gate annotation, which allows CVO to gate manifest deployment on individual feature gates rather than entire feature sets. However, CVO on 4.20 does not support the release.openshift.io/feature-gate annotation — openshift/cluster-version-operator#1273 was not backported.

As a result, the 4.20 backport #1459 uses the release.openshift.io/feature-set annotation instead, which gates the RBAC manifests behind TechPreviewNoUpgrade. This PR removes that annotation so the RBAC is deployed on Default clusters, which is required before promoting the feature gate to GA.

🤖 Generated with Claude Code

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.20.0-0.nightly-2026-07-17-010438