Skip to content

[Backport release-1.6] fix(nats): merge config.merge.accounts with the generated accounts map - #4321

Merged
myasnikovdaniil merged 1 commit into
release-1.6from
backport-4134-to-release-1.6
Sep 23, 2026
Merged

myasnikovdaniil merged 1 commit into
release-1.6from
backport-4134-to-release-1.6

Conversation

@github-actions

Copy link
Copy Markdown

Description

Backport of #4134 to release-1.6.

With users set the chart emitted accounts.A.users from the generated
passwords and then appended .Values.config.merge verbatim. A tenant that
also put an accounts block into config.merge, which is the only place to
enable JetStream for the generated account, got the key twice in the
rendered values and the release failed at post-render.

The generated users are now merged into config.merge before it is
rendered: the generated list wins for account A, everything else the
tenant put under config.merge is kept, and a config.merge without users
passes through unchanged.

Signed-off-by: Yan Bondarenko <[email protected]>
(cherry picked from commit 334f6ad)
@coderabbitai

coderabbitai Bot commented Sep 18, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Advanced

Run ID: 3a9fe6dd-a383-4f8b-aa8a-9642b4dce222

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.

@myasnikovdaniil
myasnikovdaniil merged commit f6c8f90 into release-1.6 Sep 23, 2026
2 checks passed
@myasnikovdaniil
myasnikovdaniil deleted the backport-4134-to-release-1.6 branch September 23, 2026 12:58
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.

2 participants