Skip to content

fix: Revert #14578 and #14593 #14620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 13, 2025
Merged

fix: Revert #14578 and #14593 #14620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de68a25
Revert "chore(inject): Replace root owner mechanism (#14593)"
sfleen Oct 13, 2025
809dcae
Revert "feat: Add labels for root parent object (#14578)"
sfleen Oct 13, 2025
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
3 changes: 0 additions & 3 deletions cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ spec:
app: nginx
linkerd.io/control-plane-ns: linkerd
linkerd.io/proxy-deployment: nginx
linkerd.io/proxy-root-parent: nginx
linkerd.io/proxy-root-parent-group: apps
linkerd.io/proxy-root-parent-kind: Deployment
linkerd.io/workload-ns: ""
spec:
containers:
Expand Down
6 changes: 0 additions & 6 deletions cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ spec:
app: redis
linkerd.io/control-plane-ns: linkerd
linkerd.io/proxy-deployment: redis
linkerd.io/proxy-root-parent: redis
linkerd.io/proxy-root-parent-group: apps
linkerd.io/proxy-root-parent-kind: Deployment
linkerd.io/workload-ns: ""
spec:
containers:
Expand Down Expand Up @@ -273,9 +270,6 @@ spec:
app: nginx
linkerd.io/control-plane-ns: linkerd
linkerd.io/proxy-deployment: nginx
linkerd.io/proxy-root-parent: nginx
linkerd.io/proxy-root-parent-group: apps
linkerd.io/proxy-root-parent-kind: Deployment
linkerd.io/workload-ns: ""
spec:
containers:
Expand Down
3 changes: 0 additions & 3 deletions cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ spec:
app: redis
linkerd.io/control-plane-ns: linkerd
linkerd.io/proxy-deployment: redis
linkerd.io/proxy-root-parent: redis
linkerd.io/proxy-root-parent-group: apps
linkerd.io/proxy-root-parent-kind: Deployment
linkerd.io/workload-ns: ""
spec:
containers:
Expand Down
3 changes: 0 additions & 3 deletions cli/cmd/testdata/inject_contour.golden.yml
View file
Open in desktop

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

12 changes: 0 additions & 12 deletions cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions cli/cmd/testdata/inject_emojivoto_deployment.golden.yml
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml
View file
Open in desktop

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

6 changes: 0 additions & 6 deletions cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions cli/cmd/testdata/inject_emojivoto_deployment_no_init_container.golden.yml
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml
View file
Open in desktop

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

6 changes: 0 additions & 6 deletions cli/cmd/testdata/inject_emojivoto_list.golden.yml
View file
Open in desktop

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

6 changes: 0 additions & 6 deletions cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml
View file
Open in desktop

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

6 changes: 0 additions & 6 deletions cli/cmd/testdata/inject_gettest_deployment.good.golden.yml
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions cli/cmd/testdata/inject_tap_deployment_debug.golden.yml
View file
Open in desktop

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

Loading