Skip to content

fix: persist DEFAULT_CHANNEL in prepare-release - #795

Open
thomasmaas wants to merge 1 commit into
mainfrom
fix/default-channel-stable
Open

fix: persist DEFAULT_CHANNEL in prepare-release#795
thomasmaas wants to merge 1 commit into
mainfrom
fix/default-channel-stable

Conversation

@thomasmaas

@thomasmaas thomasmaas commented Jul 15, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Add DEFAULT_CHANNEL and BUNDLE_DEFAULT_CHANNEL to the values written to make/release.mk by the prepare-release target

Why

prepare-release already persisted CHANNELS/BUNDLE_CHANNELS into make/release.mk, but never did the same for DEFAULT_CHANNEL/BUNDLE_DEFAULT_CHANNEL. This meant any subsequent make bundle invocation on a release branch silently fell back to the Makefile default (unset), producing bundles without an explicit channel.default.v1 annotation.

Same class of bug fixed for limitador-operator in Kuadrant/limitador-operator#268 / Kuadrant/limitador-operator#269.

Test plan

  • make prepare-release VERSION=0.0.0-test CHANNELS=stable DEFAULT_CHANNEL=stable writes both channel values to make/release.mk
  • Generated bundle.Dockerfile and bundle/metadata/annotations.yaml contain channel.default.v1=stable

🤖 Generated with Claude Code

Summary by CodeRabbit

  • Bug Fixes
    • Release preparation now preserves the configured default update channel in generated release settings.
    • Bundled releases are configured to use the selected default channel automatically.

@coderabbitai

coderabbitai Bot commented Jul 15, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 6eff6bb0-533f-4e83-a3a1-054ac142a029

📥 Commits

Reviewing files that changed from the base of the PR and between 94781f9 and fb40391.

📒 Files selected for processing (1)
  • Makefile

📝 Walkthrough

Walkthrough

The prepare-release target now includes default-channel configuration when generating make/release.mk, alongside the existing bundle channels and version overrides.

Changes

Release channel configuration

Layer / File(s) Summary
Write release channel overrides
Makefile
prepare-release now writes DEFAULT_CHANNEL and the derived BUNDLE_DEFAULT_CHANNEL flag to the generated release makefile.

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

Suggested reviewers: mikenairn

Poem

A rabbit hops through release night,
Adding channels neat and bright.
Defaults join the bundle’s trail,
While version notes remain in place.
Hop, hop—prepare the release!

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 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: persisting DEFAULT_CHANNEL in prepare-release.
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.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/default-channel-stable

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.

The `prepare-release` target writes CHANNELS/BUNDLE_CHANNELS to
make/release.mk but never persisted DEFAULT_CHANNEL/BUNDLE_DEFAULT_CHANNEL.
This meant subsequent `make bundle` invocations on a release branch
silently fell back to the Makefile default, producing bundles without
an explicit default-channel annotation.

Conditionally append DEFAULT_CHANNEL/BUNDLE_DEFAULT_CHANNEL to
release.mk when the caller passes DEFAULT_CHANNEL, mirroring the
existing ifneq guard at the top of the Makefile. Callers who don't
pass DEFAULT_CHANNEL see no behavior change.

Same class of bug fixed for limitador-operator in
Kuadrant/limitador-operator#268 / #269.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Thomas Maas <thomas@webtypes.com>
@thomasmaas
thomasmaas force-pushed the fix/default-channel-stable branch from fb40391 to 08d61de Compare July 15, 2026 15:54
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