Skip to content

Commit de68a25

Browse files
sfleensfleen
committed
Revert "chore(inject): Replace root owner mechanism (#14593)"
This reverts commit 9f5201e.
1 parent 4385339 commit de68a25

34 files changed

+157
-194
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ 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
2219
linkerd.io/workload-ns: ""
2320
spec:
2421
containers:

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ 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
2219
linkerd.io/workload-ns: ""
2320
spec:
2421
containers:
@@ -273,9 +270,6 @@ spec:
273270
app: nginx
274271
linkerd.io/control-plane-ns: linkerd
275272
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
279273
linkerd.io/workload-ns: ""
280274
spec:
281275
containers:

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ 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
2219
linkerd.io/workload-ns: ""
2320
spec:
2421
containers:

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

Lines changed: 0 additions & 3 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: 0 additions & 12 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: 0 additions & 3 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: 0 additions & 3 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: 0 additions & 3 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: 0 additions & 3 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: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)