Skip to content

[release-4.22] OCPBUGS-92055: Fix isNoOLMFeatureGateEnabled to check only the current cluster version#31338

Closed
openshift-cherrypick-robot wants to merge 1 commit into
openshift:release-4.22from
openshift-cherrypick-robot:cherry-pick-31329-to-release-4.22
Closed

[release-4.22] OCPBUGS-92055: Fix isNoOLMFeatureGateEnabled to check only the current cluster version#31338
openshift-cherrypick-robot wants to merge 1 commit into
openshift:release-4.22from
openshift-cherrypick-robot:cherry-pick-31329-to-release-4.22

Conversation

@openshift-cherrypick-robot

Copy link
Copy Markdown

This is an automated cherry-pick of #31329

/assign gcs278

/cherrypick release-4.21

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.

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

coderabbitai Bot commented Jun 24, 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: 08fc7109-5631-4cd4-9d67-f97d0552dac5

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

Copy link
Copy Markdown

@openshift-cherrypick-robot: Jira Issue OCPBUGS-91956 has been cloned as Jira Issue OCPBUGS-92055. Will retitle bug to link to clone.
/retitle [release-4.22] OCPBUGS-92055: Fix isNoOLMFeatureGateEnabled to check only the current cluster version

Details

In response to this:

This is an automated cherry-pick of #31329

/assign gcs278

/cherrypick release-4.21

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 openshift-ci Bot requested review from candita and miheer June 24, 2026 20:55
@openshift-ci openshift-ci Bot changed the title [release-4.22] OCPBUGS-91956: Fix isNoOLMFeatureGateEnabled to check only the current cluster version [release-4.22] OCPBUGS-92055: Fix isNoOLMFeatureGateEnabled to check only the current cluster version Jun 24, 2026
@openshift-ci

openshift-ci Bot commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: openshift-cherrypick-robot
Once this PR has been reviewed and has the lgtm label, please assign candita 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:

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 openshift-ci-robot added jira/severity-low Referenced Jira bug's severity is low for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Jun 24, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-92055, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.22.0) matches configured target version for branch (4.22.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-91956 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-91956 targets the "5.0.0" version, which is one of the valid target versions: 5.0.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:

This is an automated cherry-pick of #31329

/assign gcs278

/cherrypick release-4.21

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 openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Jun 24, 2026
@openshift-ci openshift-ci Bot requested a review from melvinjoseph86 June 24, 2026 20:55
@gcs278

gcs278 commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

I was originally planning to backport this, but it’s a one-off test failure fix that we overrode on the FG promotion PR openshift/api#2865

I’m going to close for now.
/close

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

openshift-ci Bot commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

@gcs278: Closed this PR.

Details

In response to this:

I was originally planning to backport this, but it’s a one-off test failure fix that we overrode on the FG promotion PR openshift/api#2865

I’m going to close for now.
/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.

@openshift-ci-robot

Copy link
Copy Markdown

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-92055. The bug has been updated to no longer refer to the pull request using the external bug tracker.

Details

In response to this:

This is an automated cherry-pick of #31329

/assign gcs278

/cherrypick release-4.21

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.

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

Labels

jira/severity-low Referenced Jira bug's severity is low for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants