Skip to content

Commit 763e0d3

Browse files
sfleensfleen
committed
Merge branch 'main' into sfleen/trace-inject-labels
2 parents 444cfbf + 9f5201e commit 763e0d3

File tree

37 files changed

+219
-188
lines changed

37 files changed

+219
-188
lines changed

‎cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ spec:
1616
app: nginx
1717
linkerd.io/control-plane-ns: linkerd
1818
linkerd.io/proxy-deployment: nginx
19+
linkerd.io/proxy-root-parent: nginx
20+
linkerd.io/proxy-root-parent-group: apps
21+
linkerd.io/proxy-root-parent-kind: Deployment
1922
linkerd.io/workload-ns: ""
2023
spec:
2124
containers:

‎cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ spec:
1616
app: redis
1717
linkerd.io/control-plane-ns: linkerd
1818
linkerd.io/proxy-deployment: redis
19+
linkerd.io/proxy-root-parent: redis
20+
linkerd.io/proxy-root-parent-group: apps
21+
linkerd.io/proxy-root-parent-kind: Deployment
1922
linkerd.io/workload-ns: ""
2023
spec:
2124
containers:
@@ -270,6 +273,9 @@ spec:
270273
app: nginx
271274
linkerd.io/control-plane-ns: linkerd
272275
linkerd.io/proxy-deployment: nginx
276+
linkerd.io/proxy-root-parent: nginx
277+
linkerd.io/proxy-root-parent-group: apps
278+
linkerd.io/proxy-root-parent-kind: Deployment
273279
linkerd.io/workload-ns: ""
274280
spec:
275281
containers:

‎cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ spec:
1616
app: redis
1717
linkerd.io/control-plane-ns: linkerd
1818
linkerd.io/proxy-deployment: redis
19+
linkerd.io/proxy-root-parent: redis
20+
linkerd.io/proxy-root-parent-group: apps
21+
linkerd.io/proxy-root-parent-kind: Deployment
1922
linkerd.io/workload-ns: ""
2023
spec:
2124
containers:

‎cli/cmd/testdata/inject_contour.golden.yml‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cli/cmd/testdata/inject_emojivoto_deployment.golden.yml‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)