linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

injector: remove unused proxy reference env variables (#7382) 

Fixes #6740

\#6711 removed the usage of unnecessary reference variables
in the proxy template, as they are not needed. Their definations
were left as there were race conditions with extension installs.

As `2.11` was released with that change, Now its a good time to
remove the definations too as no usages should be present from a
`2.11` upgrade.

Signed-off-by: Tarun Pothulapati <tarunpothulapati@outlook.com>
This commit is contained in:
Tarun Pothulapati 2021-12-16 00:06:18 +05:30 committed by GitHub
parent 35a9ac1d84
commit aa9ee6b007
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
57 changed files with 30 additions and 371 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
charts/partials/templates/_proxy.tpl
View File

@ -95,10 +95,6 @@ env:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: {{.Release.Namespace}}
- name: _l5d_trustdomain
value: {{$trustDomain}}
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

4
cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml vendored
View File

@ -81,10 +81,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

8
cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml vendored
View File

@ -81,10 +81,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -283,10 +279,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

4
cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml vendored
View File

@ -81,10 +81,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

4
cli/cmd/testdata/inject_contour.golden.yml generated vendored
View File

@ -89,10 +89,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

16
cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml generated vendored
View File

@ -83,10 +83,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -296,10 +292,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -509,10 +501,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -722,10 +710,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

4
cli/cmd/testdata/inject_emojivoto_deployment.golden.yml generated vendored
View File

@ -83,10 +83,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

4
cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml generated vendored
View File

@ -84,10 +84,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

4
cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml generated vendored
View File

@ -83,10 +83,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

4
cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml generated vendored
View File

@ -93,10 +93,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

8
cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml generated vendored
View File

@ -83,10 +83,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -296,10 +292,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

4
cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml generated vendored
View File

@ -84,10 +84,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

4
cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml generated vendored
View File

@ -83,10 +83,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

4
cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml generated vendored
View File

@ -83,10 +83,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

4
cli/cmd/testdata/inject_emojivoto_deployment_no_init_container.golden.yml generated vendored
View File

@ -83,10 +83,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

4
cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml generated vendored
View File

@ -84,10 +84,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

4
cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml generated vendored
View File

@ -84,10 +84,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

4
cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml generated vendored
View File

@ -85,10 +85,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

4
cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml generated vendored
View File

@ -83,10 +83,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

8
cli/cmd/testdata/inject_emojivoto_list.golden.yml generated vendored
View File

@ -85,10 +85,6 @@ items:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -297,10 +293,6 @@ items:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

8
cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml generated vendored
View File

@ -85,10 +85,6 @@ items:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -297,10 +293,6 @@ items:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

4
cli/cmd/testdata/inject_emojivoto_pod.golden.yml generated vendored
View File

@ -73,10 +73,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

4
cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml generated vendored
View File

@ -76,10 +76,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

4
cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml generated vendored
View File

@ -75,10 +75,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

4
cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml generated vendored
View File

@ -77,10 +77,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

4
cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml generated vendored
View File

@ -84,10 +84,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

8
cli/cmd/testdata/inject_gettest_deployment.good.golden.yml generated vendored
View File

@ -79,10 +79,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -294,10 +290,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

12
cli/cmd/testdata/inject_tap_deployment.input.yml vendored
View File

@ -138,18 +138,14 @@ spec:
fieldRef: fieldRef:
apiVersion: v1 apiVersion: v1
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_LOCAL_NAME - name: LINKERD2_PROXY_IDENTITY_LOCAL_NAME
value: $(_pod_sa).$(_pod_ns).serviceaccount.identity.$(_l5d_ns).$(_l5d_trustdomain) value: $(_pod_sa).$(_pod_ns).serviceaccount.identity.linkerd.cluster.local
- name: LINKERD2_PROXY_IDENTITY_SVC_NAME - name: LINKERD2_PROXY_IDENTITY_SVC_NAME
value: linkerd-identity.$(_l5d_ns).serviceaccount.identity.$(_l5d_ns).$(_l5d_trustdomain) value: linkerd-identity.linkerd.serviceaccount.identity.linkerd.cluster.local
- name: LINKERD2_PROXY_DESTINATION_SVC_NAME - name: LINKERD2_PROXY_DESTINATION_SVC_NAME
value: linkerd-destination.$(_l5d_ns).serviceaccount.identity.$(_l5d_ns).$(_l5d_trustdomain) value: linkerd-destination.linkerd.serviceaccount.identity.linkerd.cluster.local
- name: LINKERD2_PROXY_TAP_SVC_NAME - name: LINKERD2_PROXY_TAP_SVC_NAME
value: linkerd-tap.$(_l5d_ns).serviceaccount.identity.$(_l5d_ns).$(_l5d_trustdomain) value: linkerd-tap.linkerd.serviceaccount.identity.linkerd.cluster.local
image: cr.l5d.io/linkerd/proxy:git-a94122bf image: cr.l5d.io/linkerd/proxy:git-a94122bf
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:

4
cli/cmd/testdata/inject_tap_deployment_debug.golden.yml generated vendored
View File

@ -100,10 +100,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

12
cli/cmd/testdata/install_controlplane_tracing_output.golden generated vendored
View File

@ -1546,10 +1546,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -1850,10 +1846,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -2210,10 +2202,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

12
cli/cmd/testdata/install_custom_domain.golden generated vendored
View File

@ -1545,10 +1545,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -1849,10 +1845,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -2208,10 +2200,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

12
cli/cmd/testdata/install_custom_registry.golden generated vendored
View File

@ -1545,10 +1545,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -1849,10 +1845,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -2208,10 +2200,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

12
cli/cmd/testdata/install_default.golden generated vendored
View File

@ -1545,10 +1545,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -1849,10 +1845,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -2208,10 +2200,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

12
cli/cmd/testdata/install_default_override_dst_get_nets.golden generated vendored
View File

@ -1545,10 +1545,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -1849,10 +1845,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -2208,10 +2200,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

12
cli/cmd/testdata/install_default_token.golden generated vendored
View File

@ -1545,10 +1545,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -1840,10 +1836,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -2190,10 +2182,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

12
cli/cmd/testdata/install_ha_output.golden generated vendored
View File

@ -1626,10 +1626,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -1974,10 +1970,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -2373,10 +2365,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

12
cli/cmd/testdata/install_ha_with_overrides_output.golden generated vendored
View File

@ -1626,10 +1626,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -1974,10 +1970,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -2373,10 +2365,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

12
cli/cmd/testdata/install_heartbeat_disabled_output.golden generated vendored
View File

@ -1476,10 +1476,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -1780,10 +1776,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -2090,10 +2082,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

12
cli/cmd/testdata/install_helm_control_plane_output.golden generated vendored
View File

@ -806,10 +806,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd-dev
- name: _l5d_trustdomain
value: test.trust.domain
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -1113,10 +1109,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd-dev
- name: _l5d_trustdomain
value: test.trust.domain
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -1477,10 +1469,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd-dev
- name: _l5d_trustdomain
value: test.trust.domain
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

12
cli/cmd/testdata/install_helm_control_plane_output_ha.golden generated vendored
View File

@ -887,10 +887,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd-dev
- name: _l5d_trustdomain
value: test.trust.domain
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -1238,10 +1234,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd-dev
- name: _l5d_trustdomain
value: test.trust.domain
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -1642,10 +1634,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd-dev
- name: _l5d_trustdomain
value: test.trust.domain
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

12
cli/cmd/testdata/install_helm_output_ha_labels.golden generated vendored
View File

@ -895,10 +895,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd-dev
- name: _l5d_trustdomain
value: test.trust.domain
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -1250,10 +1246,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd-dev
- name: _l5d_trustdomain
value: test.trust.domain
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -1662,10 +1654,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd-dev
- name: _l5d_trustdomain
value: test.trust.domain
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

12
cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden generated vendored
View File

@ -887,10 +887,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd-dev
- name: _l5d_trustdomain
value: test.trust.domain
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -1238,10 +1234,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd-dev
- name: _l5d_trustdomain
value: test.trust.domain
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -1642,10 +1634,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd-dev
- name: _l5d_trustdomain
value: test.trust.domain
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

12
cli/cmd/testdata/install_no_init_container.golden generated vendored
View File

@ -1545,10 +1545,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -1812,10 +1808,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -2134,10 +2126,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

12
cli/cmd/testdata/install_output.golden generated vendored
View File

@ -1538,10 +1538,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -1845,10 +1841,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -2214,10 +2206,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

12
cli/cmd/testdata/install_proxy_ignores.golden generated vendored
View File

@ -1545,10 +1545,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -1849,10 +1845,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -2208,10 +2200,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: cluster.local
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

12
cli/cmd/testdata/install_values_file.golden generated vendored
View File

@ -1545,10 +1545,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: example.com
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -1849,10 +1845,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: example.com
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS
@ -2208,10 +2200,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: _l5d_ns
value: linkerd
- name: _l5d_trustdomain
value: example.com
- name: LINKERD2_PROXY_IDENTITY_DIR - name: LINKERD2_PROXY_IDENTITY_DIR
value: /var/run/linkerd/identity/end-entity value: /var/run/linkerd/identity/end-entity
- name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS

1
jaeger/charts/linkerd-jaeger/README.md
View File

@ -73,6 +73,7 @@ Kubernetes: `>=1.20.0-0`
| Key | Type | Default | Description | | Key | Type | Default | Description |
|-----|------|---------|-------------| |-----|------|---------|-------------|
| clusterDomain | string | `"cluster.local"` | Kubernetes DNS Domain name to use |
| collector.config | string | see `value.yaml` for actual configuration | OpenTelemetry Collector config, See the [Configuration docs](https://opentelemetry.io/docs/collector/configuration/) for more information | | collector.config | string | see `value.yaml` for actual configuration | OpenTelemetry Collector config, See the [Configuration docs](https://opentelemetry.io/docs/collector/configuration/) for more information |
| collector.enabled | bool | `true` | Set to false to exclude collector installation | | collector.enabled | bool | `true` | Set to false to exclude collector installation |
| collector.image.name | string | `"otel/opentelemetry-collector"` | | | collector.image.name | string | `"otel/opentelemetry-collector"` | |

2
jaeger/charts/linkerd-jaeger/templates/jaeger-injector.yaml
View File

@ -38,6 +38,8 @@ spec:
- -collector-svc-addr={{.Values.webhook.collectorSvcAddr}} - -collector-svc-addr={{.Values.webhook.collectorSvcAddr}}
- -collector-svc-account={{.Values.webhook.collectorSvcAccount}} - -collector-svc-account={{.Values.webhook.collectorSvcAccount}}
- -log-level={{.Values.webhook.logLevel}} - -log-level={{.Values.webhook.logLevel}}
- -cluster-domain={{.Values.clusterDomain}}
- -linkerd-namespace={{.Values.linkerdNamespace}}
image: {{.Values.webhook.image.name}}:{{default .Values.webhook.image.version .Values.cliVersion}} image: {{.Values.webhook.image.name}}:{{default .Values.webhook.image.version .Values.cliVersion}}
imagePullPolicy: {{.Values.webhook.image.pullPolicy}} imagePullPolicy: {{.Values.webhook.image.pullPolicy}}
livenessProbe: livenessProbe:

3
jaeger/charts/linkerd-jaeger/values.yaml
View File

@ -17,6 +17,9 @@ tolerations: &default_tolerations
# deprecated since k8s v1.21 # deprecated since k8s v1.21
enablePSP: false enablePSP: false
# -- Kubernetes DNS Domain name to use
clusterDomain: cluster.local
collector: collector:
# -- Set to false to exclude collector installation # -- Set to false to exclude collector installation
enabled: true enabled: true

2
jaeger/cmd/testdata/install_collector_disabled.golden generated vendored
View File

@ -76,6 +76,8 @@ spec:
- -collector-svc-addr=collector.linkerd-jaeger:55678 - -collector-svc-addr=collector.linkerd-jaeger:55678
- -collector-svc-account=collector - -collector-svc-account=collector
- -log-level=info - -log-level=info
- -cluster-domain=cluster.local
- -linkerd-namespace=linkerd
image: cr.l5d.io/linkerd/jaeger-webhook:dev-undefined image: cr.l5d.io/linkerd/jaeger-webhook:dev-undefined
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:

2
jaeger/cmd/testdata/install_default.golden generated vendored
View File

@ -76,6 +76,8 @@ spec:
- -collector-svc-addr=collector.linkerd-jaeger:55678 - -collector-svc-addr=collector.linkerd-jaeger:55678
- -collector-svc-account=collector - -collector-svc-account=collector
- -log-level=info - -log-level=info
- -cluster-domain=cluster.local
- -linkerd-namespace=linkerd
image: cr.l5d.io/linkerd/jaeger-webhook:dev-undefined image: cr.l5d.io/linkerd/jaeger-webhook:dev-undefined
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:

2
jaeger/cmd/testdata/install_jaeger_disabled.golden generated vendored
View File

@ -76,6 +76,8 @@ spec:
- -collector-svc-addr=collector.linkerd-jaeger:55678 - -collector-svc-addr=collector.linkerd-jaeger:55678
- -collector-svc-account=collector - -collector-svc-account=collector
- -log-level=info - -log-level=info
- -cluster-domain=cluster.local
- -linkerd-namespace=linkerd
image: cr.l5d.io/linkerd/jaeger-webhook:dev-undefined image: cr.l5d.io/linkerd/jaeger-webhook:dev-undefined
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:

4
jaeger/injector/cmd/main.go
View File

@ -22,13 +22,15 @@ func main() {
"collector service address for the proxies to send trace data") "collector service address for the proxies to send trace data")
collectorSvcAccount := cmd.String("collector-svc-account", "", collectorSvcAccount := cmd.String("collector-svc-account", "",
"service account associated with the collector instance") "service account associated with the collector instance")
clusterDomain := cmd.String("cluster-domain", "cluster.local", "kubernetes cluster domain")
linkerdNamespace := cmd.String("linkerd-namespace", "linkerd", "namespace in which Linkerd control-plane is installed")
flags.ConfigureAndParse(cmd, os.Args[1:]) flags.ConfigureAndParse(cmd, os.Args[1:])
webhook.Launch( webhook.Launch(
context.Background(), context.Background(),
[]k8s.APIResource{k8s.NS}, []k8s.APIResource{k8s.NS},
mutator.Mutate(*collectorSvcAddr, *collectorSvcAccount), mutator.Mutate(*collectorSvcAddr, *collectorSvcAccount, *clusterDomain, *linkerdNamespace),
"linkerd-jaeger-injector", "linkerd-jaeger-injector",
*metricsAddr, *metricsAddr,
*addr, *addr,

2
jaeger/injector/mutator/patch.go
View File

@ -27,7 +27,7 @@ const tpl = `[
"path": "/spec/containers/{{.ProxyIndex}}/env/-", "path": "/spec/containers/{{.ProxyIndex}}/env/-",
"value": { "value": {
"name": "LINKERD2_PROXY_TRACE_COLLECTOR_SVC_NAME", "name": "LINKERD2_PROXY_TRACE_COLLECTOR_SVC_NAME",
"value": "{{.CollectorSvcAccount}}.serviceaccount.identity.$(_l5d_ns).$(_l5d_trustdomain)" "value": "{{.CollectorSvcAccount}}.serviceaccount.identity.{{.LinkerdNamespace}}.{{.ClusterDomain}}"
} }
}, },
{ {

6
jaeger/injector/mutator/webhook.go
View File

@ -29,11 +29,13 @@ type Params struct {
ProxyIndex int ProxyIndex int
CollectorSvcAddr string CollectorSvcAddr string
CollectorSvcAccount string CollectorSvcAccount string
ClusterDomain string
LinkerdNamespace string
} }
// Mutate returns an AdmissionResponse containing the patch, if any, to apply // Mutate returns an AdmissionResponse containing the patch, if any, to apply
// to the proxy // to the proxy
func Mutate(collectorSvcAddr, collectorSvcAccount string) webhook.Handler { func Mutate(collectorSvcAddr, collectorSvcAccount, clusterDomain, linkerdNamespace string) webhook.Handler {
return func( return func(
ctx context.Context, ctx context.Context,
api *k8s.API, api *k8s.API,
@ -59,6 +61,8 @@ func Mutate(collectorSvcAddr, collectorSvcAccount string) webhook.Handler {
ProxyIndex: webhook.GetProxyContainerIndex(pod.Spec.Containers), ProxyIndex: webhook.GetProxyContainerIndex(pod.Spec.Containers),
CollectorSvcAddr: collectorSvcAddr, CollectorSvcAddr: collectorSvcAddr,
CollectorSvcAccount: collectorSvcAccount, CollectorSvcAccount: collectorSvcAccount,
ClusterDomain: clusterDomain,
LinkerdNamespace: linkerdNamespace,
} }
if params.ProxyIndex < 0 || labels.IsTracingEnabled(pod) { if params.ProxyIndex < 0 || labels.IsTracingEnabled(pod) {
return admissionResponse, nil return admissionResponse, nil

11
pkg/k8s/k8s.go
View File

@ -2,6 +2,7 @@ package k8s
import ( import (
"fmt" "fmt"
"strings"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
@ -208,17 +209,11 @@ func PodIdentity(pod *corev1.Pod) (string, error) {
podns := pod.ObjectMeta.Namespace podns := pod.ObjectMeta.Namespace
for _, c := range pod.Spec.Containers { for _, c := range pod.Spec.Containers {
if c.Name == ProxyContainerName { if c.Name == ProxyContainerName {
var l5dns string
var l5dtrustdomain string
for _, env := range c.Env { for _, env := range c.Env {
if env.Name == "_l5d_ns" { if env.Name == "LINKERD2_PROXY_IDENTITY_LOCAL_NAME" {
l5dns = env.Value return strings.ReplaceAll(env.Value, "$(_pod_sa).$(_pod_ns)", fmt.Sprintf("%s.%s", podsa, podns)), nil
}
if env.Name == "_l5d_trustdomain" {
l5dtrustdomain = env.Value
} }
} }
return fmt.Sprintf("%s.%s.serviceaccount.identity.%s.%s", podsa, podns, l5dns, l5dtrustdomain), nil
} }
} }
return "", nil return "", nil

6
viz/metrics-api/edges_test.go
View File

@ -50,10 +50,8 @@ spec:
containers: containers:
- name: linkerd-proxy - name: linkerd-proxy
env: env:
- name: _l5d_ns - name: LINKERD2_PROXY_IDENTITY_LOCAL_NAME
value: linkerd value: $(_pod_sa).$(_pod_ns).serviceaccount.identity.linkerd.cluster.local
- name: _l5d_trustdomain
value: cluster.local
serviceAccountName: %s serviceAccountName: %s
status: status:
phase: Running phase: Running