fix: nomad template whitespace trimming strips newlines between env var blocks (#996)
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
ci/woodpecker/push/nomad-validate Pipeline was successful
ci/woodpecker/pr/ci Pipeline was successful
ci/woodpecker/pr/nomad-validate Pipeline was successful
ci/woodpecker/pr/secret-scan Pipeline was successful

This commit is contained in:
dev-qwen2 2026-04-18 10:06:24 +00:00
parent dfb1a45295
commit 1a43227f11
2 changed files with 12 additions and 0 deletions

View file

@ -152,36 +152,43 @@ FORGE_PASS={{ .Data.data.pass }}
FORGE_TOKEN=seed-me FORGE_TOKEN=seed-me
FORGE_PASS=seed-me FORGE_PASS=seed-me
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/bots/review" -}} {{- with secret "kv/data/disinto/bots/review" -}}
FORGE_REVIEW_TOKEN={{ .Data.data.token }} FORGE_REVIEW_TOKEN={{ .Data.data.token }}
{{- else -}} {{- else -}}
FORGE_REVIEW_TOKEN=seed-me FORGE_REVIEW_TOKEN=seed-me
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/bots/gardener" -}} {{- with secret "kv/data/disinto/bots/gardener" -}}
FORGE_GARDENER_TOKEN={{ .Data.data.token }} FORGE_GARDENER_TOKEN={{ .Data.data.token }}
{{- else -}} {{- else -}}
FORGE_GARDENER_TOKEN=seed-me FORGE_GARDENER_TOKEN=seed-me
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/bots/architect" -}} {{- with secret "kv/data/disinto/bots/architect" -}}
FORGE_ARCHITECT_TOKEN={{ .Data.data.token }} FORGE_ARCHITECT_TOKEN={{ .Data.data.token }}
{{- else -}} {{- else -}}
FORGE_ARCHITECT_TOKEN=seed-me FORGE_ARCHITECT_TOKEN=seed-me
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/bots/planner" -}} {{- with secret "kv/data/disinto/bots/planner" -}}
FORGE_PLANNER_TOKEN={{ .Data.data.token }} FORGE_PLANNER_TOKEN={{ .Data.data.token }}
{{- else -}} {{- else -}}
FORGE_PLANNER_TOKEN=seed-me FORGE_PLANNER_TOKEN=seed-me
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/bots/predictor" -}} {{- with secret "kv/data/disinto/bots/predictor" -}}
FORGE_PREDICTOR_TOKEN={{ .Data.data.token }} FORGE_PREDICTOR_TOKEN={{ .Data.data.token }}
{{- else -}} {{- else -}}
FORGE_PREDICTOR_TOKEN=seed-me FORGE_PREDICTOR_TOKEN=seed-me
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/bots/supervisor" -}} {{- with secret "kv/data/disinto/bots/supervisor" -}}
FORGE_SUPERVISOR_TOKEN={{ .Data.data.token }} FORGE_SUPERVISOR_TOKEN={{ .Data.data.token }}
{{- else -}} {{- else -}}
FORGE_SUPERVISOR_TOKEN=seed-me FORGE_SUPERVISOR_TOKEN=seed-me
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/bots/vault" -}} {{- with secret "kv/data/disinto/bots/vault" -}}
FORGE_VAULT_TOKEN={{ .Data.data.token }} FORGE_VAULT_TOKEN={{ .Data.data.token }}
{{- else -}} {{- else -}}

View file

@ -94,26 +94,31 @@ GITHUB_TOKEN={{ .Data.data.value }}
{{- else -}} {{- else -}}
GITHUB_TOKEN= GITHUB_TOKEN=
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/runner/CODEBERG_TOKEN" -}} {{- with secret "kv/data/disinto/runner/CODEBERG_TOKEN" -}}
CODEBERG_TOKEN={{ .Data.data.value }} CODEBERG_TOKEN={{ .Data.data.value }}
{{- else -}} {{- else -}}
CODEBERG_TOKEN= CODEBERG_TOKEN=
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/runner/CLAWHUB_TOKEN" -}} {{- with secret "kv/data/disinto/runner/CLAWHUB_TOKEN" -}}
CLAWHUB_TOKEN={{ .Data.data.value }} CLAWHUB_TOKEN={{ .Data.data.value }}
{{- else -}} {{- else -}}
CLAWHUB_TOKEN= CLAWHUB_TOKEN=
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/runner/DEPLOY_KEY" -}} {{- with secret "kv/data/disinto/runner/DEPLOY_KEY" -}}
DEPLOY_KEY={{ .Data.data.value }} DEPLOY_KEY={{ .Data.data.value }}
{{- else -}} {{- else -}}
DEPLOY_KEY= DEPLOY_KEY=
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/runner/NPM_TOKEN" -}} {{- with secret "kv/data/disinto/runner/NPM_TOKEN" -}}
NPM_TOKEN={{ .Data.data.value }} NPM_TOKEN={{ .Data.data.value }}
{{- else -}} {{- else -}}
NPM_TOKEN= NPM_TOKEN=
{{- end }} {{- end }}
{{- with secret "kv/data/disinto/runner/DOCKER_HUB_TOKEN" -}} {{- with secret "kv/data/disinto/runner/DOCKER_HUB_TOKEN" -}}
DOCKER_HUB_TOKEN={{ .Data.data.value }} DOCKER_HUB_TOKEN={{ .Data.data.value }}
{{- else -}} {{- else -}}