INTEROP-9358: Fix operator channel and preflight compatibility for OPP upgrade configs#82372
INTEROP-9358: Fix operator channel and preflight compatibility for OPP upgrade configs#82372amp-rh wants to merge 1 commit into
Conversation
…P upgrade configs - Fix Quay channel stable-3.14 to stable-3.17 in 4.22 upgrade config (stable-3.14 is outside Red Hat tested integrations for OCP 4.21) - Add OPP_COMPAT entry for OCP 5.0 (key "0", ACM 2.17 + Quay 3.17)
|
@amp-rh: This pull request references INTEROP-9358 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "5.0.0" version, but no target version was set. 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: amp-rh 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 |
WalkthroughThe OPP upgrade workflow now selects Quay Operator channel ChangesOPP upgrade compatibility
Estimated code review effort: 1 (Trivial) | ~2 minutes Possibly related PRs
🚥 Pre-merge checks | ✅ 15✅ Passed checks (15 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
[REHEARSALNOTIFIER]
Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals. Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In
`@ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-commands.sh`:
- Line 76: Update check_opp_compatibility so an unparseable CSV version
increments failed and causes the compatibility check to fail, rather than only
logging a warning and continuing. Preserve the existing compatibility validation
for parseable versions and ensure the active OPP_COMPAT["0"] entry cannot report
success when its versions are unparseable.
- Line 76: Update the OPP_COMPAT entry used by the preflight compatibility check
so its key conveys the target OCP 5.0 major version rather than only minor
version 0. Ensure the helper’s logs and report details identify OCP 5.0
correctly while preserving the existing compatibility image mappings.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: d2606581-fbb1-4729-b9f9-8abbc4bae429
📒 Files selected for processing (2)
ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yamlci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-commands.sh
| OPP_COMPAT["20"]="advanced-cluster-management:2.14 rhacs-operator:4.9 odf-operator:4.20 quay-operator:3.15" | ||
| OPP_COMPAT["21"]="advanced-cluster-management:2.15 rhacs-operator:4.10 odf-operator:4.21 quay-operator:3.15" | ||
| OPP_COMPAT["22"]="advanced-cluster-management:2.16 rhacs-operator:4.11 odf-operator:4.22 quay-operator:3.16" | ||
| OPP_COMPAT["0"]="advanced-cluster-management:2.17 quay-operator:3.17" |
There was a problem hiding this comment.
🎯 Functional Correctness | 🟠 Major | ⚡ Quick win
Do not let an unparseable version pass the new compatibility gate.
With this entry active, check_opp_compatibility can log a warning for an unparseable CSV version and continue without incrementing failed; if all entries are unparseable, the check reports success without verifying ACM or Quay. Treat that branch as a failure.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In
`@ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-commands.sh`
at line 76, Update check_opp_compatibility so an unparseable CSV version
increments failed and causes the compatibility check to fail, rather than only
logging a warning and continuing. Preserve the existing compatibility validation
for parseable versions and ensure the active OPP_COMPAT["0"] entry cannot report
success when its versions are unparseable.
🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win
Use the target major version in compatibility messages.
For target OCP 5.0, this key causes the check to run with target_minor=0, but the helper reports OCP 4.0 in its logs and report details. Pass the full target version or major version so diagnostics identify OCP 5.0 correctly.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In
`@ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-commands.sh`
at line 76, Update the OPP_COMPAT entry used by the preflight compatibility
check so its key conveys the target OCP 5.0 major version rather than only minor
version 0. Ensure the helper’s logs and report details identify OCP 5.0
correctly while preserving the existing compatibility image mappings.
|
@amp-rh: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
Summary
Fix Quay operator channel in the 4.22 upgrade config and add OCP 5.0 entry to the OPP compatibility matrix.
Changes
Quay channel fix (4.22 upgrade config): Change
stable-3.14tostable-3.17. Quay 3.14 is outside Red Hat tested integrations for OCP 4.21 (the source version). Verified against Red Hat operator catalog index.OPP_COMPAT entry for OCP 5.0: Add
OPP_COMPAT["0"]with ACM 2.17 and Quay 3.17 minimums. Only these two operators are present in the v5.0 catalog (rhacs-operator and odf-operator are absent).Verification
cut -f2 -d.on "5.0.x")References
Summary by CodeRabbit
stable-3.17.0.