Skip to content

fix(tracing): Add more guards and fallback to control plane tracing config #14650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2025
Merged

fix(tracing): Add more guards and fallback to control plane tracing config #14650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion charts/linkerd-control-plane/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ controller:
# -- Enables trace collection and export in the proxy
enabled: false
collector:
# -- The collector endpoint to send traces to. Required if tracing is enabled
# -- The collector endpoint to send traces to. Required if tracing is
# enabled. If this is unset and `proxy.tracing.collector.endpoint` is set,
# that endpoint will be re-used here.
endpoint: ""
# -- enabling this omits the NET_ADMIN capability in the PSP
# and the proxy-init container when injecting the proxy;
Expand Down
9 changes: 6 additions & 3 deletions charts/partials/templates/_trace.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{{ define "partials.linkerd.trace" -}}
{{ if ((.Values.controller.tracing).enabled) -}}
{{- if empty .Values.controller.tracing.collector.endpoint }}
{{- fail "controller.tracing.collector.endpoint must be set if control plane tracing is enabled" }}
{{- end }}
{{- if (.Values.controller.tracing.collector).endpoint }}
- -trace-collector={{.Values.controller.tracing.collector.endpoint}}
{{- else if ((.Values.proxy.tracing).collector).endpoint }}
- -trace-collector={{.Values.proxy.tracing.collector.endpoint}}
{{- else }}
{{- fail "controller.tracing.collector.endpoint or proxy.tracing.collector.endpoint must be set if control plane tracing is enabled" }}
{{- end }}
{{ end -}}
{{- end }}