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

fix(transparent-proxy): make iptables mode detection more defensive (backport of #9776) #9787

Closed
wants to merge 1 commit into from

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Apr 2, 2024

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

Generated by action

cherry-picked commit fdebf4b
⚠️ ⚠️ ⚠️ 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 fdebf4b7d.
  (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:   pkg/transparentproxy/iptables/builder/builder_raw.go
	modified:   pkg/transparentproxy/iptables/setup.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   pkg/transparentproxy/config/config.go
	both modified:   pkg/transparentproxy/iptables/builder/builder.go
	deleted by us:   pkg/transparentproxy/iptables/builder/builder_restore.go

@bartsmykla bartsmykla closed this Apr 2, 2024
@bartsmykla bartsmykla deleted the chore/backport-release-2.3-9776 branch April 2, 2024 14:02
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