Skip to content

INTEROP-9358: Fix operator channel and preflight compatibility for OPP upgrade configs#82372

Open
amp-rh wants to merge 1 commit into
openshift:mainfrom
amp-rh:interop-9358-upgrade-channel-compat
Open

INTEROP-9358: Fix operator channel and preflight compatibility for OPP upgrade configs#82372
amp-rh wants to merge 1 commit into
openshift:mainfrom
amp-rh:interop-9358-upgrade-channel-compat

Conversation

@amp-rh

@amp-rh amp-rh commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

Summary

Fix Quay operator channel in the 4.22 upgrade config and add OCP 5.0 entry to the OPP compatibility matrix.

Changes

  1. Quay channel fix (4.22 upgrade config): Change stable-3.14 to stable-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.

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

  • Operator catalog presence verified using Red Hat operator catalog index (synced Jun-Jul 2026)
  • Version key "0" confirmed by reading the preflight script's version parsing logic (cut -f2 -d. on "5.0.x")

References

Summary by CodeRabbit

  • Updates the OCP 4.22 OPP upgrade workflow to use Quay operator channel stable-3.17.
  • Adds OCP 5.0 compatibility checks requiring ACM 2.17 and Quay 3.17 or newer, ensuring preflight validation runs for the parsed version key 0.
  • Reflects that the OCP 5.0 catalog contains only ACM and Quay operators.

…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)
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 23, 2026
@openshift-ci-robot

openshift-ci-robot commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

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

Details

In response to this:

Summary

Fix Quay operator channel in the 4.22 upgrade config and add OCP 5.0 entry to the OPP compatibility matrix.

Changes

  1. Quay channel fix (4.22 upgrade config): Change stable-3.14 to stable-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.

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

  • Operator catalog presence verified using Red Hat operator catalog index (synced Jun-Jul 2026)
  • Version key "0" confirmed by reading the preflight script's version parsing logic (cut -f2 -d. on "5.0.x")

References

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 jan-law and shakyav July 23, 2026 18:29
@openshift-ci

openshift-ci Bot commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: amp-rh
Once this PR has been reviewed and has the lgtm label, please assign yiraechristinekim 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

@coderabbitai

coderabbitai Bot commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

Walkthrough

The OPP upgrade workflow now selects Quay Operator channel stable-3.17 and checks minimum ACM and Quay Operator versions when the target minor version is 0.

Changes

OPP upgrade compatibility

Layer / File(s) Summary
Compatibility and operator selection
ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-commands.sh, ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml
Adds compatibility requirements for target minor 0 and updates the Quay Operator channel from stable-3.14 to stable-3.17.

Estimated code review effort: 1 (Trivial) | ~2 minutes

Possibly related PRs

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly matches the main changes to operator channel and OPP preflight compatibility.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed No Ginkgo test titles were added or changed; the PR only touches a YAML config and a shell compatibility script.
Test Structure And Quality ✅ Passed No Ginkgo tests were changed; the PR only modifies a YAML config and a shell script, so the test-structure check is not applicable.
Microshift Test Compatibility ✅ Passed Only a YAML config and a bash step script changed; no new Ginkgo tests or MicroShift-relevant APIs were added.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PASS: The PR only changes a ci-operator YAML and a preflight shell script; no Ginkgo test definitions or SNO-sensitive assumptions were added.
Topology-Aware Scheduling Compatibility ✅ Passed Only an operator channel pin and OPP version map were changed; no manifests, controllers, replicas, affinity, or topology-aware scheduling logic were added.
Ote Binary Stdout Contract ✅ Passed PR only changes a YAML config and a ci-operator shell step; no OTE main/TestMain/Ginkgo setup code or stdout-using Go binaries were modified.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No new Ginkgo e2e tests were added; the PR only changes CI config and a bash preflight matrix entry, with no IPv4-only assumptions or public-internet deps in new test code.
No-Weak-Crypto ✅ Passed PASS: Changes only update a Quay channel and OPP version matrix entry; touched files contain no weak-crypto primitives, custom crypto, or secret comparisons.
Container-Privileges ✅ Passed Diff only changes a CI job config and a bash preflight script; no privileged, hostPID/Network/IPC, SYS_ADMIN, root, or allowPrivilegeEscalation settings were added.
No-Sensitive-Data-In-Logs ✅ Passed The PR only changes an operator channel and adds an OPP compatibility entry; no new logs or sensitive-data exposures were introduced.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@amp-rh: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
periodic-ci-stolostron-policy-collection-main-ocp4.22-upgrade-interop-opp-upgrade-aws N/A periodic Ci-operator config changed

Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

📥 Commits

Reviewing files that changed from the base of the PR and between cbd3c07 and dbe6579.

📒 Files selected for processing (2)
  • ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml
  • ci-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"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@openshift-ci

openshift-ci Bot commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

@amp-rh: 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.

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

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants