Skip to content

[Backport release-1.6] fix(rabbitmq): right-size the default resources preset to s1.nano - #4393

Merged
myasnikovdaniil merged 2 commits into
cozystack:release-1.6from
yankawai:backport-3936-release-1.6
Sep 23, 2026
Merged

myasnikovdaniil merged 2 commits into
cozystack:release-1.6from
yankawai:backport-3936-release-1.6

Conversation

@yankawai

Copy link
Copy Markdown
Contributor

What this PR does

Manual backport of #3936 to release-1.6.

The automated backport, #4372, pushed conflict markers in packages/apps/rabbitmq/README.md and packages/system/rabbitmq-rd/cozyrds/rabbitmq.yaml as its only commit, so it would ship them if merged. Both are generated files, and the conflict is the tls block that landed on main after 1.6 was cut. Everything else applies unchanged, so two differences follow:

  • the README parameter table and the cozyrd schema are regenerated from the 1.6 values with cozyvalues-gen v1.6.0, so they carry the new default and descriptions without tls;
  • the 1.6 rabbitmq Makefile has no test target, so the helm-unittest sweep would never enter the package and the new preset suite would not run. The second commit adds the same two lines main already has.

Verified on this branch: the rabbitmq suite passes 4/4, make -n test answers the sweep probe, and a second make generate produces no drift.

Change summary, unchanged from #3936: the default resourcesPreset moves from t1.nano (128Mi) to s1.nano (250m CPU, 512Mi), because a default-sized RabbitMQ 4.2 broker was OOMKilled on t1.nano and never became Ready. The resources and resourcesPreset descriptions say the preset fills every resource resources leaves unset.

Close #4372 in favour of this one, or tell me to take a different route and I will.

Screenshots

Not a UI change.

Downstream repositories

Walked the trigger map against the diff: one app chart with a changed default. The provider follow-up is cozystack/terraform-provider-cozystack#34, labelled target/1.7.

Release note

fix(rabbitmq): raise the default resources preset from t1.nano to s1.nano so a default-sized broker is not OOMKilled. Existing brokers that never set resourcesPreset move to s1.nano on upgrade and roll their pods.

A default-sized RabbitMQ 4.2 broker was OOMKilled on t1.nano (128Mi)
and never became Ready; its working set peaked at 125.8Mi. s1.nano keeps
the 250m CPU and gives 512Mi. The resources and resourcesPreset
descriptions now say the preset fills every resource that resources
leaves unset. The parameter table and the cozyrd schema are regenerated
from the 1.6 values, which carry no tls block.

(cherry picked from commit 12e64a9)
Signed-off-by: Yan Bondarenko <[email protected]>
The 1.6 rabbitmq Makefile has no test target, so the helm-unittest sweep
never enters the package and the preset suite would sit there unrun.
main gained the target earlier; this brings the same two lines.

Signed-off-by: Yan Bondarenko <[email protected]>
@coderabbitai

coderabbitai Bot commented Sep 22, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: cozystack/cozystack/.coderabbit.yaml

Review profile: CHILL

Plan: Advanced

Run ID: e93cc247-2891-4d5c-859b-88dc715a18f4

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

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.

@github-actions github-actions Bot added size/L This PR changes 100-499 lines, ignoring generated files area/database Issues or PRs related to managed databases (postgres, mariadb, redis, etcd, kafka, clickhouse) area/release Issues or PRs related to release tooling (changelog, backport, release pipeline) kind/bug Categorizes issue or PR as related to a bug labels Sep 22, 2026
@myasnikovdaniil
myasnikovdaniil merged commit 4d710fc into cozystack:release-1.6 Sep 23, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/database Issues or PRs related to managed databases (postgres, mariadb, redis, etcd, kafka, clickhouse) area/release Issues or PRs related to release tooling (changelog, backport, release pipeline) kind/bug Categorizes issue or PR as related to a bug size/L This PR changes 100-499 lines, ignoring generated files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants