Skip to content

fix: catalog multi-channel support and upgrade metadata#172

Merged
openshift-merge-bot[bot] merged 2 commits into
mainfrom
fix/file-based-catalog-missing-content
Jul 2, 2026
Merged

fix: catalog multi-channel support and upgrade metadata#172
openshift-merge-bot[bot] merged 2 commits into
mainfrom
fix/file-based-catalog-missing-content

Conversation

@clobrano

@clobrano clobrano commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

Why we need this PR

The currently File-based catalog does not handle multi-channel correctly.

Changes made

  • Use DEFAULT_CHANNEL in opm init
  • Add channel iteration for multi-channel support
  • Include upgrade metadata (replaces, skipRange) in channel entries.

Which issue(s) this PR fixes

Related to RHWA-351

Test plan

make catalog-build
# expected: DEFAULT_CHANNEL: stable, one olm.channel entry with name: stable and no skipRange, nor replaces

CHANNELS=stable,test VERSION=0.21.0 PREVIOUS_VERSION=0.20.1 SKIP_RANGE_LOWER=0.20.0 make catalog-build
# expected: DEFAULT_CHANNEL: stable, two olm.channel blobs, one with name: stable and one with name: test, skipRange with 0.20.0 and 0.21.0, and replaces 0.20.1

# ensure DEFAULT_CHANNEL is in CHANNELS
CHANNELS=test VERSION=0.21.0 PREVIOUS_VERSION=0.20.1 SKIP_RANGE_LOWER=0.20.0 make catalog-build
Makefile:53: *** DEFAULT_CHANNEL "stable" must be present in CHANNELS "test".  Stop.

Summary by CodeRabbit

  • New Features

    • Catalog channel entries can now be generated for multiple channels, with separate entries created for each one.
    • Bundle generation now supports optional skip-range metadata when building catalog entries.
  • Bug Fixes

    • Default channel handling now uses the configured default channel instead of the full channel list.
    • Added validation to prevent invalid skip-range values from being used during build generation.
  • Chores

    • Updated ignore rules for catalog-related files.

@openshift-ci

openshift-ci Bot commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@coderabbitai

coderabbitai Bot commented Jun 26, 2026

Copy link
Copy Markdown

Warning

Review limit reached

@clobrano, you've reached your PR review limit, so we couldn't start this review.

Next review available in: 36 minutes

Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available.
You're only billed for reviews past your plan's rate limits ($0.25/file).

How can I continue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews.

How do review limits work?

CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability.

For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window.

Please refer docs for additional details.

Review details
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: ce2e3629-57fd-4f79-9d63-f51e94a457c2

📥 Commits

Reviewing files that changed from the base of the PR and between 15f06db and e3a51bc.

📒 Files selected for processing (2)
  • .gitignore
  • Makefile
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/file-based-catalog-missing-content

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.

@razo7 razo7 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for the fix after medik8s/node-healthcheck-operator#311 discussion.
Please care to include https://redhat.atlassian.net/browse/RHWA-351 or the child issue in the PR description for reference

Comment thread Makefile
@clobrano clobrano force-pushed the fix/file-based-catalog-missing-content branch 2 times, most recently from a629b72 to 15f06db Compare July 1, 2026 07:15

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 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 `@Makefile`:
- Around line 47-48: The DEFAULT_CHANNEL assignment is unconditional, which
prevents environment overrides and makes bundle always see a defined value.
Update the Makefile definition near DEFAULT_CHANNEL so it uses conditional
assignment instead of a hard assignment, preserving the default while still
allowing callers and the bundle target to override it via DEFAULT_CHANNEL.
🪄 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: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: d45a1e03-2cb5-470b-9858-82665aec748e

📥 Commits

Reviewing files that changed from the base of the PR and between 3a54cd1 and 15f06db.

📒 Files selected for processing (2)
  • .gitignore
  • Makefile

Comment thread Makefile Outdated
razo7
razo7 previously approved these changes Jul 1, 2026

@razo7 razo7 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for addressing the changes and I left one small NIT
Feel free to unhold if you disagree or want to fix it later
/hold

Comment thread Makefile Outdated
Use DEFAULT_CHANNEL in opm init, add channel iteration for
multi-channel support, and include upgrade metadata (replaces,
skipRange) in channel entries.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
@clobrano clobrano force-pushed the fix/file-based-catalog-missing-content branch from 01f4aa2 to 65020cd Compare July 1, 2026 12:47
razo7
razo7 previously approved these changes Jul 1, 2026

@razo7 razo7 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

One more small NIT since we are using DEFAULT_CHANNEL in the PR

Comment thread Makefile Outdated
@openshift-ci openshift-ci Bot added the lgtm label Jul 1, 2026
Prevents build errors by ensuring the default channel is always included
in the channel list.

Co-authored-by: Claude Sonnet 4.5
@clobrano clobrano force-pushed the fix/file-based-catalog-missing-content branch from 65020cd to e3a51bc Compare July 1, 2026 13:54
@openshift-ci openshift-ci Bot removed the lgtm label Jul 1, 2026
@openshift-ci openshift-ci Bot added the lgtm label Jul 1, 2026
@openshift-ci

openshift-ci Bot commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: clobrano, razo7

The full list of commands accepted by this bot can be found here.

The pull request process is described 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

@clobrano clobrano marked this pull request as ready for review July 1, 2026 14:14
@openshift-ci openshift-ci Bot requested review from mshitrit and razo7 July 1, 2026 14:14
@clobrano

clobrano commented Jul 1, 2026

Copy link
Copy Markdown
Contributor Author

/test 4.23-ci-bundle-my-bundle

@razo7

razo7 commented Jul 1, 2026

Copy link
Copy Markdown
Member

/unhold
/retest

@razo7

razo7 commented Jul 2, 2026

Copy link
Copy Markdown
Member

/retest

@openshift-merge-bot openshift-merge-bot Bot merged commit ee76af9 into main Jul 2, 2026
16 checks passed
@openshift-ci

openshift-ci Bot commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

@clobrano: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/4.23-images e3a51bc link unknown /test 4.23-images
ci/prow/4.22-images e3a51bc link unknown /test 4.22-images
ci/prow/5.0-images e3a51bc link unknown /test 5.0-images

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.

@clobrano

clobrano commented Jul 2, 2026

Copy link
Copy Markdown
Contributor Author

/retest-required

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants