Skip to content

Commit fc75ab8

Browse files
sfleensfleen
authored
feat(jaeger)!: Remove linkerd-jaeger extension (#14558)
* chore(docs): Update tracing documentation This clarifies the tracing documentation that the trace collector must be meshed, along with the specifics of how the service account name for the collector should be set. Signed-off-by: Scott Fleener <[email protected]> * chore(docs): Include `serviceAccountNamespace` for tracing collector This separates out the service account namespace from the name to make it clearer how to set the correct service account for the trace collector. Signed-off-by: Scott Fleener <[email protected]> * chore(docs): Make docs clearer about what needs to be set for the collector mesh identity Signed-off-by: Scott Fleener <[email protected]> * feat!(tracing): Improve control plane tracing configuration The current control plane tracing relies on the linkerd-jaeger extension, and does not work when using the native tracing configuration. This removes the previous configs, and adds new control plane tracing config that mirrors the existing proxy tracing configs. The previous configuration was meant entirely for internal testing purposes, and shouldn't be subject to any breaking change guarantees. Signed-off-by: Scott Fleener <[email protected]> * feat!(tracing): Delete jaeger extension Signed-off-by: Scott Fleener <[email protected]> * fix(tests): Update goldens Signed-off-by: Scott Fleener <[email protected]> * fix(test): Update tracing test values Signed-off-by: Scott Fleener <[email protected]> * feat(charts): Switch ServiceAccountName to separate Name and Namespace fields Signed-off-by: Scott Fleener <[email protected]> * fix: Change deprecated casing for lint Signed-off-by: Scott Fleener <[email protected]> * chore: Rename fields and semantics of tracing identity Signed-off-by: Scott Fleener <[email protected]> * chore: Fix bad auto-rename Signed-off-by: Scott Fleener <[email protected]> * chore: Change to breaking API change Signed-off-by: Scott Fleener <[email protected]> * chore: Regenerate goldens Signed-off-by: Scott Fleener <[email protected]> * fix: Use correct trace enable value Signed-off-by: Scott Fleener <[email protected]> * fix(docs): Typos in docs Signed-off-by: Scott Fleener <[email protected]> --------- Signed-off-by: Scott Fleener <[email protected]>
1 parent 3b46333 commit fc75ab8

File tree

70 files changed

+3
-5344
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+3
-5344
lines changed

‎.github/workflows/integration.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ jobs:
231231
strategy:
232232
matrix:
233233
component:
234-
- jaeger-webhook
235234
- metrics-api
236235
- tap
237236
- web

‎.github/workflows/release.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ jobs:
4242
component:
4343
- controller
4444
- debug
45-
- jaeger-webhook
4645
- metrics-api
4746
- proxy
4847
- tap

‎BUILD.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,6 @@ its extensions are written in Go. The dashboard UI is a React application.
7474
- [`linkerd-service-mirror-xxx`](multicluster/service-mirror): Controller
7575
observing the labeling of exported services in the target cluster, each one
7676
for which it will create a mirrored service in the local cluster.
77-
- [`jaeger extension`](jaeger)
78-
- [`jaeger-injector`](jaeger/injector): Mutating webhook triggered by pods
79-
creation, that expands the proxy container for it to produce tracing spans.
8077

8178
### Data Plane (Rust)
8279

@@ -493,7 +490,6 @@ Extensions provide each their own chart:
493490
- Viz: [`viz/charts/linkerd-viz`](viz/charts/linkerd-viz)
494491
- Multicluster:
495492
[`multicluster/charts/linkerd-multicluster`](multicluster/charts/linkerd-multicluster)
496-
- Jaeger: [`jaeger/charts/linkerd-jaeger`](jaeger/charts/linkerd-jaeger)
497493

498494
### Making changes to the chart templates
499495

‎bin/_docker.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ export DOCKER_IMAGES=(${DOCKER_IMAGES:-
3737
debug
3838
proxy
3939
web
40-
jaeger-webhook
4140
tap
4241
})
4342

‎bin/_test-helpers.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,6 @@ Help:
288288
image_load() {
289289
cluster_name=$1
290290
images_load=("${images_load_default[@]}")
291-
if [[ "$cluster_name" = *viz ]]; then
292-
images_load+=(jaeger-webhook)
293-
fi
294291
case $images in
295292
docker)
296293
"$bindir"/image-load --k3d --cluster "$cluster_name" "${images_load[@]}"

‎bin/docker-build‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,5 @@ if [ -z "${LINKERD_LOCAL_BUILD_CLI:-}" ]; then
1818
else
1919
"$bindir"/build-cli-bin
2020
fi
21-
"$bindir"/docker-build-jaeger-webhook
2221
"$bindir"/docker-build-metrics-api
2322
"$bindir"/docker-build-tap

‎bin/docker-build-jaeger-webhook‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎bin/helm-build‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ setValues() {
66
sed -i "s/$1/$2/" charts/linkerd-control-plane/values.yaml
77
sed -i "s/$1/$2/" charts/linkerd2-cni/values.yaml
88
sed -i "s/$1/$2/" multicluster/charts/linkerd-multicluster/values.yaml
9-
sed -i "s/$1/$2/" jaeger/charts/linkerd-jaeger/values.yaml
109
sed -i "s/$1/$2/" viz/charts/linkerd-viz/values.yaml
1110
}
1211

@@ -26,7 +25,6 @@ rm -f charts/linkerd-crds/charts/*
2625
rm -f charts/linkerd-control-plane/charts/*
2726
rm -f charts/linkerd2-cni/charts/*
2827
rm -f charts/patch/charts/*
29-
rm -f jaeger/charts/linkerd-jaeger/charts/*
3028
rm -f viz/charts/linkerd-viz/charts/*
3129

3230
"$bindir"/helm dep up "$rootdir"/multicluster/charts/linkerd-multicluster
@@ -42,8 +40,6 @@ rm -f viz/charts/linkerd-viz/charts/*
4240
"$bindir"/helm lint "$rootdir"/charts/linkerd-crds
4341
"$bindir"/helm lint --set identityTrustAnchorsPEM="fake-trust" --set identity.issuer.tls.crtPEM="fake-cert" --set identity.issuer.tls.keyPEM="fake-key" "$rootdir"/charts/linkerd-control-plane
4442
"$bindir"/helm lint "$rootdir"/charts/linkerd2-cni
45-
"$bindir"/helm dep up "$rootdir"/jaeger/charts/linkerd-jaeger
46-
"$bindir"/helm lint "$rootdir"/jaeger/charts/linkerd-jaeger
4743
"$bindir"/helm dep up "$rootdir"/viz/charts/linkerd-viz
4844
"$bindir"/helm lint "$rootdir"/viz/charts/linkerd-viz
4945

@@ -68,7 +64,6 @@ if [ "$1" = package ]; then
6864
"$bindir"/helm --app-version "$tag" -d "$rootdir"/target/helm package "$rootdir"/charts/linkerd-control-plane
6965
"$bindir"/helm --app-version "$tag" -d "$rootdir"/target/helm package "$rootdir"/charts/linkerd2-cni
7066
"$bindir"/helm --app-version "$tag" -d "$rootdir"/target/helm package "$rootdir"/multicluster/charts/linkerd-multicluster
71-
"$bindir"/helm --app-version "$tag" -d "$rootdir"/target/helm package "$rootdir"/jaeger/charts/linkerd-jaeger
7267
"$bindir"/helm --app-version "$tag" -d "$rootdir"/target/helm package "$rootdir"/viz/charts/linkerd-viz
7368

7469
mv "$rootdir"/target/helm/index-pre.yaml "$rootdir"/target/helm/index-pre-"$version".yaml

‎bin/test-cleanup‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ echo "cleaning up viz extension resources, if present [${k8s_context}]"
1616
echo "cleaning up multicluster resources, if present [${k8s_context}]"
1717
"$linkerd_path" mc uninstall 2> /dev/null | kubectl --context="$k8s_context" delete -f -
1818

19-
echo "cleaning up jaeger extension resources, if present [${k8s_context}]"
20-
"$linkerd_path" jaeger uninstall 2> /dev/null | kubectl --context="$k8s_context" delete -f -
21-
2219
echo 'cleaning up the all namespaces labelled with test.linkerd.io/is-test-data-plane'
2320
kubectl --context="$k8s_context" delete ns -l test.linkerd.io/is-test-data-plane
2421

‎charts/linkerd-control-plane/README.md.gotmpl‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,6 @@ extensions:
123123
[Linkerd-viz](https://github.com/linkerd/linkerd2/blob/main/viz/charts/linkerd-viz/README.md)
124124
* Multicluster:
125125
[Linkerd-multicluster](https://github.com/linkerd/linkerd2/blob/main/multicluster/charts/linkerd-multicluster/README.md)
126-
* Tracing:
127-
[Linkerd-jaeger](https://github.com/linkerd/linkerd2/blob/main/jaeger/charts/linkerd-jaeger/README.md)
128126

129127
{{ template "chart.requirementsSection" . }}
130128

0 commit comments

Comments
 (0)