[redhat-3.16] NO-ISSUE: fix: set channel.default.v1 annotation to bundle's own channel#1262
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>
|
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 |
|
@openshift-cherrypick-robot: The following test failed, say
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. |
This is an automated cherry-pick of #1260
/assign Marcusk19