DataDog / helm-charts

Helm charts for Datadog products
Apache License 2.0
330 stars 1.01k forks source link

Fix envFrom indentation in synthetics-private-location #1361

Closed tmcg-gusto closed 3 months ago

tmcg-gusto commented 3 months ago

What this PR does / why we need it:

0.15.29 breaks the indentation of envFrom in the synthetics-private-location deployment template. This adjusts the templating to use the same {{- and nindent that other variables use.

Tested locally by uncommenting the example envFrom in values.yaml: Before this change: $ cd charts/synthetics-private-location $ helm template .

Error: YAML parse error on synthetics-private-location/templates/deployment.yaml: error converting YAML to JSON: yaml: line 41: did not find expected key

Use --debug flag to render out invalid YAML

After this change: Valid yaml.

Tested with:

$ helm version
version.BuildInfo{Version:"v3.10.2", GitCommit:"50f003e5ee8704ec937a756c646870227d7c8b58", GitTreeState:"clean", GoVersion:"go1.19.3"}

Which issue this PR fixes

(optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged)

Special notes for your reviewer:

Checklist

[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]

tmcg-gusto commented 3 months ago

@ruizb All good!

Just rebased and got all the commits signed properly (apparently I didn't have that enabled by default). Anything left to do on my end?

protoz commented 3 months ago

Any chance you can also add nindent to https://github.com/DataDog/helm-charts/blob/ceb3d1618654d7770ba14d4738ab78422c9f657b/charts/synthetics-private-location/templates/deployment.yaml#L79C31-L79C32

This is also broken for env.

ruizb commented 3 months ago

Anything left to do on my end?

No, all good! I'm waiting for the CI to pass before merging, I forgot to do it last time ^^'

This is also broken for env.

Let me create a quick PR to fix 👍 Thank you for reporting! (edit: https://github.com/DataDog/helm-charts/pull/1363)

ruizb commented 3 months ago

/merge

dd-devflow[bot] commented 3 months ago

:x: MergeQueue

You are not allowed to use the merge queue towards main.

If you need support, contact us on Slack #ci-interfaces with those details!