Skip to content

fix(odf-operator): respect explicit ODF_OPERATOR_SUB_CHANNEL over der… - #82666

Open
mgencur wants to merge 1 commit into
openshift:mainfrom
mgencur:odf_channel_override
Open

fix(odf-operator): respect explicit ODF_OPERATOR_SUB_CHANNEL over der…#82666
mgencur wants to merge 1 commit into
openshift:mainfrom
mgencur:odf_channel_override

Conversation

@mgencur

@mgencur mgencur commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

…ived value

When a custom CatalogSource is found, the script derived the ODF subscription channel from the CatalogSource name, overriding any explicitly set ODF_OPERATOR_SUB_CHANNEL. Guard the derivation with an emptiness check so that an explicit channel value takes precedence.

Summary by CodeRabbit

Updates ODF Operator CI subscription configuration so an explicitly provided ODF_OPERATOR_SUB_CHANNEL takes precedence. When unset, the channel is derived from a custom redhat-operators CatalogSource name; otherwise, no default channel overrides the supplied value.

…ived value

When a custom CatalogSource is found, the script derived the ODF
subscription channel from the CatalogSource name, overriding any
explicitly set ODF_OPERATOR_SUB_CHANNEL. Guard the derivation with
an emptiness check so that an explicit channel value takes precedence.

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

openshift-ci Bot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: mgencur
Once this PR has been reviewed and has the lgtm label, please assign aleskandro 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 30, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 9ca6510c-3c3d-4641-94a7-4e9ec362d3e3

📥 Commits

Reviewing files that changed from the base of the PR and between f6962e5 and 044aebb.

📒 Files selected for processing (2)
  • ci-operator/step-registry/operatorhub/subscribe/odf-operator/operatorhub-subscribe-odf-operator-commands.sh
  • ci-operator/step-registry/operatorhub/subscribe/odf-operator/operatorhub-subscribe-odf-operator-ref.yaml

Walkthrough

The ODF subscription step now defaults its channel to empty and derives a stable-<version> channel from a custom CatalogSource only when no channel was provided.

Changes

ODF channel selection

Layer / File(s) Summary
Channel default and derivation
ci-operator/step-registry/operatorhub/subscribe/odf-operator/operatorhub-subscribe-odf-operator-ref.yaml, ci-operator/step-registry/operatorhub/subscribe/odf-operator/operatorhub-subscribe-odf-operator-commands.sh
The channel environment variable defaults to empty, and custom CatalogSource-based derivation runs only when the variable is unset.

Estimated code review effort: 2 (Simple) | ~5 minutes

🚥 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 change: explicit ODF_OPERATOR_SUB_CHANNEL now overrides the CatalogSource-derived value.
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 Only a shell script and YAML changed; no Ginkgo test titles were added or modified.
Test Structure And Quality ✅ Passed PR only touches a shell script and step YAML; no Ginkgo tests were added or modified, so the test-quality checklist doesn't apply.
Microshift Test Compatibility ✅ Passed PR only changes a shell script and step YAML; no new Ginkgo/e2e tests or MicroShift-unsupported APIs were added.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No new or modified Ginkgo e2e tests were added; the PR only changes a shell script and step YAML, so the SNO check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed PR only changes ODF subscription channel selection and env defaults; no manifests/controllers add replicas, node selectors, anti-affinity, or spread constraints.
Ote Binary Stdout Contract ✅ Passed The PR only changes a step-registry shell script and YAML; no OTE binary main/init/TestMain stdout contract code was touched.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No Ginkgo e2e tests were added; the PR only changes a shell step and env default, with no IPv4 assumptions or external connectivity.
No-Weak-Crypto ✅ Passed The diff only adjusts ODF channel selection/env defaults; no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB, custom crypto, or secret comparisons appear.
Container-Privileges ✅ Passed Touched files are a shell script and step-ref YAML; no privileged, hostPID/Network/IPC, SYS_ADMIN, root, or allowPrivilegeEscalation settings were added.
No-Sensitive-Data-In-Logs ✅ Passed The changed script logs only CatalogSource/package/channel/namespace values, and the shared CatalogSource name is a Kubernetes resource name, not a secret or PII.
✨ 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 requested review from aleskandro and xueqzhan July 30, 2026 11:42
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@mgencur: 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
pull-ci-openshift-cloud-provider-kubevirt-main-hypershift-kubevirt-conformance-baremetalds openshift/cloud-provider-kubevirt presubmit Registry content changed
pull-ci-openshift-cloud-provider-kubevirt-release-5.1-hypershift-kubevirt-conformance-baremetalds openshift/cloud-provider-kubevirt presubmit Registry content changed
pull-ci-openshift-cloud-provider-kubevirt-release-5.0-hypershift-kubevirt-conformance-baremetalds openshift/cloud-provider-kubevirt presubmit Registry content changed
pull-ci-openshift-cloud-provider-kubevirt-release-4.23-hypershift-kubevirt-conformance-baremetalds openshift/cloud-provider-kubevirt presubmit Registry content changed
pull-ci-openshift-cloud-provider-kubevirt-release-4.22-hypershift-kubevirt-conformance-baremetalds openshift/cloud-provider-kubevirt presubmit Registry content changed
pull-ci-openshift-cloud-provider-kubevirt-release-4.21-hypershift-kubevirt-conformance-baremetalds openshift/cloud-provider-kubevirt presubmit Registry content changed
pull-ci-openshift-cloud-provider-kubevirt-release-4.20-hypershift-kubevirt-conformance-baremetalds openshift/cloud-provider-kubevirt presubmit Registry content changed
pull-ci-openshift-cloud-provider-kubevirt-release-4.19-hypershift-kubevirt-conformance-baremetalds openshift/cloud-provider-kubevirt presubmit Registry content changed
pull-ci-openshift-cloud-provider-kubevirt-release-4.18-hypershift-kubevirt-conformance-baremetalds openshift/cloud-provider-kubevirt presubmit Registry content changed
pull-ci-openshift-cloud-provider-kubevirt-release-4.17-hypershift-kubevirt-conformance-baremetalds openshift/cloud-provider-kubevirt presubmit Registry content changed
pull-ci-openshift-cloud-provider-kubevirt-release-4.16-hypershift-kubevirt-conformance-baremetalds openshift/cloud-provider-kubevirt presubmit Registry content changed
pull-ci-openshift-cloud-provider-kubevirt-release-4.15-hypershift-kubevirt-conformance-baremetalds openshift/cloud-provider-kubevirt presubmit Registry content changed
pull-ci-openshift-cloud-provider-kubevirt-release-4.14-hypershift-kubevirt-conformance-baremetalds openshift/cloud-provider-kubevirt presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.21-e2e-kubevirt-metal-conformance openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.20-e2e-kubevirt-metal-conformance openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.19-e2e-kubevirt-metal-conformance openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.18-e2e-kubevirt-metal-conformance openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.17-e2e-kubevirt-metal-conformance openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.16-e2e-kubevirt-metal-ovn-conformance openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-main-e2e-kubevirt-metal-ovn-backuprestore openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-5.1-e2e-kubevirt-metal-ovn-backuprestore openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-5.0-e2e-kubevirt-metal-ovn-backuprestore openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.23-e2e-kubevirt-metal-ovn-backuprestore openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.22-e2e-kubevirt-metal-ovn-backuprestore openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.21-e2e-kubevirt-metal-ovn-backuprestore openshift/hypershift presubmit Registry content changed

A total of 130 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here
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.

@mgencur

mgencur commented Jul 30, 2026

Copy link
Copy Markdown
Contributor Author

Hey @aleskandro , could you please tag this? It's the same change as you already tagged in #81194 (comment)
Sorry, I didn't notice your comment because I needed more approvals and the other people didn't approve yet.

@openshift-ci

openshift-ci Bot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

@mgencur: 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

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant