Skip to content

Commit 9233dd3

Browse files
authored
fix(helm): use parenthesized tracing guards (#14634)
If upgrading linkerd to the latest edge without using the latest values.yaml, the helm chart could blow up with a nil deref. This adds guards that ensure proper defaulting.
1 parent 83181ba commit 9233dd3

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

charts/linkerd-control-plane/templates/destination.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,6 @@ spec:
450450
- {{- include "partials.proxy.volumes.service-account-token" . | indent 8 | trimPrefix (repeat 7 " ") }}
451451
{{ end -}}
452452
- {{- include "partials.proxy.volumes.identity" . | indent 8 | trimPrefix (repeat 7 " ") }}
453-
{{ if .Values.proxy.tracing.enable -}}
453+
{{ if ((.Values.proxy.tracing).enable) -}}
454454
- {{- include "partials.proxy.volumes.podinfo" . | indent 8 | trimPrefix (repeat 7 " ") }}
455455
{{ end }}

charts/linkerd-control-plane/templates/identity.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ spec:
276276
- {{- include "partials.proxy.volumes.service-account-token" . | indent 8 | trimPrefix (repeat 7 " ") }}
277277
{{ end -}}
278278
- {{- include "partials.proxy.volumes.identity" . | indent 8 | trimPrefix (repeat 7 " ") }}
279-
{{- if .Values.proxy.tracing.enable }}
279+
{{- if ((.Values.proxy.tracing).enable) }}
280280
- {{- include "partials.proxy.volumes.podinfo" . | indent 8 | trimPrefix (repeat 7 " ") }}
281281
{{- end }}
282282
{{end -}}

charts/linkerd-control-plane/templates/proxy-injector.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ spec:
187187
- {{- include "partials.proxy.volumes.service-account-token" . | indent 8 | trimPrefix (repeat 7 " ") }}
188188
{{ end -}}
189189
- {{- include "partials.proxy.volumes.identity" . | indent 8 | trimPrefix (repeat 7 " ") }}
190-
{{if .Values.proxy.tracing.enable -}}
190+
{{if ((.Values.proxy.tracing).enable) -}}
191191
- {{- include "partials.proxy.volumes.podinfo" . | indent 8 | trimPrefix (repeat 7 " ") }}
192192
{{ end }}
193193
---

0 commit comments

Comments
 (0)