Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ and their proxies by using the `--set controlPlaneTracing=true` installation
flag.

This will configure all the components to send the traces at
`collector.{{.Values.controlPlaneTracingNamespace}}.svc.{{.Values.ClusterDomain}}:55678`
`collector.{{.Values.controlPlaneTracingNamespace}}.svc.{{.Values.ClusterDomain}}:4317`

```bash

Expand Down
2 changes: 1 addition & 1 deletion charts/partials/templates/_trace.tpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{ define "partials.linkerd.trace" -}}
{{ if .Values.controlPlaneTracing -}}
- -trace-collector=collector.{{.Values.controlPlaneTracingNamespace}}.svc.{{.Values.clusterDomain}}:55678
- -trace-collector=collector.{{.Values.controlPlaneTracingNamespace}}.svc.{{.Values.clusterDomain}}:4317
{{ end -}}
{{- end }}
4 changes: 2 additions & 2 deletions cli/cmd/testdata/install_controlplane_tracing_output.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion jaeger/charts/linkerd-jaeger/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ webhook:

# -- collector service address for the proxies to send trace data.
# Points by default to the linkerd-jaeger collector
collectorSvcAddr: collector.linkerd-jaeger:55678
collectorSvcAddr: collector.linkerd-jaeger:4317
# -- protocol proxies should use to send trace data.
# Can be `opencensus` or `opentelemetry` (default)
collectorTraceProtocol: opentelemetry
Expand Down
2 changes: 1 addition & 1 deletion jaeger/cmd/testdata/install_collector_disabled.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion jaeger/cmd/testdata/install_default.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion jaeger/cmd/testdata/install_jaeger_disabled.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.