Skip to content

chart: fix invalid YAML for nested storage fields (rateLimit) - #275

Merged
arttor merged 2 commits into
clyso:mainfrom
den-dw:fix/chart-nested-storage-fields
Oct 26, 2026
Merged

arttor merged 2 commits into
clyso:mainfrom
den-dw:fix/chart-nested-storage-fields

Conversation

@den-dw

@den-dw den-dw commented Oct 23, 2026

Copy link
Copy Markdown
Contributor

Pull Request

Description

Nested fields of a storage (e.g. rateLimit) rendered invalid YAML in the proxy and worker config:

          rateLimit: enabled: true
          rpm: 600

{{ $key }}: {{ $value | toYaml | nindent 6 | trim }} trims the newline that a nested map needs and indents it at the key's own level. Maps and lists are now rendered as a nested block (indent 8), scalars stay inline; the scalar branch also uses indent 8, so multi-line strings get valid block indentation. For storages with scalar fields only the rendered output is byte-identical to main (checked with default values and with a two-storage S3 config).

Related Issue

Fixes #273

Checklist

  • I have read the CONTRIBUTING.md file.
  • My commits include a Signed-off-by line to certify agreement with the Developer Certificate of Origin (DCO).
  • make test passing — chart-only change; helm lint and helm template with nested rateLimit pass, generated configs parse as YAML
  • I have updated documentation in README.md if applicable. — not applicable

Note: By submitting this PR, you agree to license your contributions under the Apache 2.0 License and follow our Code of Conduct.

🤖 Generated with Claude Code

@den-dw
den-dw force-pushed the fix/chart-nested-storage-fields branch from fcbff33 to 821f03d Compare October 23, 2026 11:32

@arttor arttor left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, the fix looks good. The chart is published at release with the version from Chart.yaml, so please bump deploy/chorus/Chart.yaml version from 0.4.0 to 0.4.1. After that it's ready to merge.

@arttor

arttor commented Oct 26, 2026

Copy link
Copy Markdown
Contributor

please also rebase onto main to make tests pass on CI

'{{ $key }}: {{ $value | toYaml | nindent 6 | trim }}' trimmed the newline a nested map needs and indented it at the key's level, so e.g. storage rateLimit produced 'rateLimit: enabled: true' and the proxy/worker config failed to parse. Render maps and lists as a nested block, keep scalars inline; output for scalar-only storages is unchanged.

Signed-off-by: Denis Ivanov <dendw.work@gmail.com>
Signed-off-by: Denis Ivanov <dendw.work@gmail.com>
@den-dw
den-dw force-pushed the fix/chart-nested-storage-fields branch from 821f03d to 0a354da Compare October 26, 2026 13:47
@arttor
arttor merged commit 6072806 into clyso:main Oct 26, 2026
2 checks passed
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.

Helm chart: nested storage fields (e.g. rateLimit) render invalid YAML

2 participants