Skip to content

Commit b476274

Browse files
authored
fix(tracing): traces were not exposing workload metadata (#14684)
The `linkerd-podinfo` volume wasn't being added to injected pods, thus forbidding traces to expose the pod's metadata. The cause was that the linkerd-control-plane `values.yaml` file declared the entry `proxy.tracing.enabled` whereas the templates were using `proxy.tracing.enable`.
1 parent 3d8324b commit b476274

File tree

6 files changed

+38
-5
lines changed

6 files changed

+38
-5
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).enabled) -}}
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).enabled) }}
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).enabled) -}}
191191
- {{- include "partials.proxy.volumes.podinfo" . | indent 8 | trimPrefix (repeat 7 " ") }}
192192
{{ end }}
193193
---

charts/partials/templates/_proxy.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ lifecycle:
320320
volumeMounts:
321321
- mountPath: /var/run/linkerd/identity/end-entity
322322
name: linkerd-identity-end-entity
323-
{{- if .Values.proxy.tracing | default (dict) | dig "enable" false }}
323+
{{- if .Values.proxy.tracing | default (dict) | dig "enabled" false }}
324324
- mountPath: /var/run/linkerd/podinfo
325325
name: linkerd-podinfo
326326
{{- end }}

charts/patch/templates/patch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ structs.
103103
}
104104
}
105105
},
106-
{{- if .Values.proxy.tracing | default (dict) | dig "enable" false }}
106+
{{- if .Values.proxy.tracing | default (dict) | dig "enabled" false }}
107107
{
108108
"op": "add",
109109
"path": "{{$prefix}}/spec/volumes/-",

cli/cmd/testdata/install_tracing.golden

Lines changed: 33 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)