Skip to content

[release-4.21] Fix isNoOLMFeatureGateEnabled to check only the current cluster version#31331

Closed
gcs278 wants to merge 1 commit into
openshift:release-4.21from
gcs278:fix-isNoOLMFeatureGateEnabled-version-4.21
Closed

[release-4.21] Fix isNoOLMFeatureGateEnabled to check only the current cluster version#31331
gcs278 wants to merge 1 commit into
openshift:release-4.21from
gcs278:fix-isNoOLMFeatureGateEnabled-version-4.21

Conversation

@gcs278

@gcs278 gcs278 commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

Summary

🤖 Generated with Claude Code

The FeatureGate CR status.featureGates contains entries for each
cluster version. After an upgrade, entries for both the old and new
versions exist. isNoOLMFeatureGateEnabled was iterating all version
entries, so it could incorrectly return true by finding the gate
enabled in a pre-upgrade version's entry, even though the current
version has it disabled. This caused the e2e-upgrade-out-of-change
test to fail because it expected a sail finalizer that the CIO
had already removed during the downgrade path.

Fix this by looking up the current cluster version from ClusterVersion
status.desired.version and only checking the matching featureGates
entry.

https://redhat.atlassian.net/browse/OCPBUGS-91956

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Jun 23, 2026

Copy link
Copy Markdown

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: 0a27db01-6493-46e0-b798-cc753124a955

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 openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 23, 2026
@openshift-ci

openshift-ci Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

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

@openshift-ci

openshift-ci Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gcs278

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:

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

@gcs278

gcs278 commented Jun 23, 2026

Copy link
Copy Markdown
Contributor Author

Using the cherry-pick command just to be clean
/close

@openshift-ci openshift-ci Bot closed this Jun 23, 2026
@openshift-ci

openshift-ci Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

@gcs278: Closed this PR.

Details

In response to this:

Using the cherry-pick command just to be clean
/close

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant