fix: restore missing newline between per-world manifests in worlds.yaml
Re-applying the independently-diagnosed Helm bug fix that got reverted
along with everything else a few rounds back (flagged at the time that
CI would hit this again the moment it wasn't reapplied -- it just did).
helm lint deploy/chart (the default 5-world values.yaml) fails:
templates/worlds.yaml: unable to parse YAML: error converting YAML
to JSON: yaml: line 24: did not find expected key
Root cause (confirmed earlier via `helm template --debug` on the raw,
pre-parse output): the per-world loop's `{{- $host := ... -}}` line has
a leading whitespace-trim that eats the one newline separating one
world's rendered manifests from the next world's "---" separator, so
consecutive iterations run together as "...port: { name: http } }---
apiVersion: apps/v1" with no newline -- invalid YAML. values-srs.yaml
only has one world, so the loop never repeats and never trips this;
the default values.yaml has five.
Fix: drop the leading trim (`{{-` -> `{{`) on just that line, so the
one separating newline survives.
Verified with the same helm v4.2.4 CI uses: `helm lint`/`helm template`
clean against both deploy/chart's default values (5 worlds) and
-f deploy/values-srs.yaml (1 world); rendered manifests for all 5
worlds look correct.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
{{- end -}}
|
||||
{{- if and .Values.portal.host (not (hasKey $ids .Values.portal.primaryWorld)) -}}{{- fail "portal.primaryWorld must exist in worlds" -}}{{- end -}}
|
||||
{{- range .Values.worlds }}
|
||||
{{- $host := default .host $root.Values.portal.host -}}
|
||||
{{ $host := default .host $root.Values.portal.host -}}
|
||||
{{- $primary := eq .id $root.Values.portal.primaryWorld -}}
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
|
||||
Reference in New Issue
Block a user