Skip to content

Commit 01f058e

Browse files
authored
chore(proxy): Add annotations to downward API (#14580)
Some annotations are used in the proxy for trace labels, this adds them into the downward API for consumption by the proxy. Signed-off-by: Scott Fleener <[email protected]>
1 parent 575de34 commit 01f058e

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

charts/partials/templates/_proxy.tpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ env:
151151
{{ if .Values.proxy.tracing | default (dict) | dig "enabled" false -}}
152152
- name: LINKERD2_PROXY_TRACE_ATTRIBUTES_PATH
153153
value: /var/run/linkerd/podinfo/labels
154+
- name: LINKERD2_PROXY_TRACE_ANNOTATIONS_PATH
155+
value: /var/run/linkerd/podinfo/annotations
154156
- name: LINKERD2_PROXY_TRACE_PROTOCOL
155157
value: {{ default "opentelemetry" .Values.proxy.tracing.protocol }}
156158
- name: LINKERD2_PROXY_TRACE_SERVICE_NAME

charts/partials/templates/_volumes.tpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ downwardAPI:
1111
- path: labels
1212
fieldRef:
1313
fieldPath: metadata.labels
14+
- path: annotations
15+
fieldRef:
16+
fieldPath: metadata.annotations
1417
{{- end -}}
1518

1619
{{ define "partials.proxyInit.volumes.xtables" -}}

0 commit comments

Comments
 (0)