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) #9788

Merged
merged 2 commits into from Apr 2, 2024

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Apr 2, 2024

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

Generated by action

cherry-picked commit fdebf4b
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

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

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/config/config.go
	modified:   pkg/transparentproxy/iptables/builder/builder_restore.go
	modified:   pkg/transparentproxy/iptables/builder/builder_table_raw.go
	modified:   pkg/transparentproxy/iptables/setup.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/transparentproxy/iptables/builder/builder.go

@kumahq kumahq bot requested a review from a team as a code owner April 2, 2024 14:00
@kumahq kumahq bot requested review from slonka, jakubdyszkiewicz and Automaat and removed request for a team April 2, 2024 14:00
Signed-off-by: Bart Smykla <bartek@smykla.com>
@bartsmykla bartsmykla added ci/force-publish PR: push artifacts even if we're on a PR (use very carefully) and removed conflict ci/force-publish PR: push artifacts even if we're on a PR (use very carefully) labels Apr 2, 2024
@bartsmykla bartsmykla enabled auto-merge (squash) April 2, 2024 14:25
@bartsmykla bartsmykla merged commit 35f57c2 into release-2.5 Apr 2, 2024
9 checks passed
@bartsmykla bartsmykla deleted the chore/backport-release-2.5-9776 branch April 2, 2024 14:41
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.

None yet

2 participants