[redhat-3.9] NO-ISSUE: fix: set channel.default.v1 annotation to bundle's own channel#1267
Open
openshift-cherrypick-robot wants to merge 1 commit into
Conversation
The prepare-upstream.sh script was setting the bundle's channel.default.v1 annotation to DEFAULT_CHANNEL (the package-level default, e.g. stable-3.17), even when the bundle only belongs to a different channel (e.g. stable-3.9). This causes the community-operators FBC pipeline to fail: the build-fbc-scratch-catalog step creates a minimal scratch catalog containing only the bundle's channel but sets defaultChannel to the value from channel.default.v1 — OPM rejects this because the referenced default channel doesn't exist in the catalog. The fix changes channel.default.v1 to use CHANNEL (the bundle's own channel) instead of DEFAULT_CHANNEL. The package-level default channel is managed separately in the FBC catalog template, not in individual bundle annotations. This is consistent with hack/build.sh which already uses CHANNEL for both annotations. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Marcus Kok <mkok@redhat.com>
2 tasks
|
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 UI 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✨ Simplify code
Comment |
Marcusk19
approved these changes
May 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an automated cherry-pick of #1260
/assign Marcusk19