[release-4.22] OCPBUGS-92055: Fix isNoOLMFeatureGateEnabled to check only the current cluster version#31338
Conversation
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>
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository: openshift/coderabbit/.coderabbit.yaml Review profile: CHILL Plan: Enterprise Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
|
@openshift-cherrypick-robot: Jira Issue OCPBUGS-91956 has been cloned as Jira Issue OCPBUGS-92055. Will retitle bug to link to clone. DetailsIn response to this:
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. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: openshift-cherrypick-robot The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
@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
Requesting review from QA contact: The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this:
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. |
|
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. |
|
@gcs278: Closed this PR. DetailsIn response to this:
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-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. DetailsIn response to this:
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. |
This is an automated cherry-pick of #31329
/assign gcs278
/cherrypick release-4.21