Skip to content
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.

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

feat(transparent-proxy): add automatic iptables type detection (backport of #9750) #9762

Closed
wants to merge 1 commit into from

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Mar 29, 2024

Automatic cherry-pick of #9750 for branch release-2.3

Generated by action

cherry-picked commit 8f00873
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

On branch release-2.3
Your branch is up to date with 'origin/release-2.3'.

You are currently cherry-picking commit 8f00873c8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   app/cni/pkg/cni/injector_linux.go
	modified:   app/kumactl/cmd/completion/testdata/bash.golden
	modified:   pkg/transparentproxy/setup.go
	modified:   pkg/transparentproxy/transparentproxy.go
	modified:   pkg/transparentproxy/transparentproxy_v2.go
	modified:   test/blackbox_network_tests/dns_test.go
	modified:   test/blackbox_network_tests/inbound_redirect_test.go
	modified:   test/blackbox_network_tests/outbound_redirect_test.go
	modified:   test/framework/universal_app.go
	modified:   tools/releases/dockerfiles/kuma-init.Dockerfile

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   app/kumactl/cmd/install/install_transparent_proxy.go
	both modified:   app/kumactl/cmd/install/install_transparent_proxy_test.go
	deleted by us:   app/kumactl/cmd/install/testdata/install-transparent-proxy.dns.no-conntrack.golden.txt
	both modified:   pkg/transparentproxy/iptables/builder/builder.go
	deleted by us:   pkg/transparentproxy/iptables/builder/builder_restore.go
	both modified:   pkg/transparentproxy/iptables/setup.go

@bartsmykla bartsmykla closed this Mar 29, 2024
@bartsmykla bartsmykla deleted the chore/backport-release-2.3-9750 branch March 29, 2024 10:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant