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): allow to wait for xtables lock and retry when installing tproxy fails (backport of #7870) #7892

Merged
merged 4 commits into from
Sep 27, 2023

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Sep 27, 2023

Automatic cherry-pick of #7870 for branch release-2.4

Generated by action

cherry-picked commit 078c2ef
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

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

You are currently cherry-picking commit 078c2ef4f.
  (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/kumactl/cmd/completion/testdata/bash.golden
	modified:   app/kumactl/cmd/install/install_transparent_proxy.go
	modified:   app/kumactl/cmd/install/install_transparent_proxy_test.go
	modified:   docs/generated/cmd/kumactl/kumactl_install_transparent-proxy.md
	modified:   pkg/transparentproxy/config/config.go
	modified:   pkg/transparentproxy/iptables/builder/builder.go
	new file:   pkg/transparentproxy/iptables/builder/builder_restore.go
	renamed:    pkg/transparentproxy/iptables/builder/builder_mangle.go -> pkg/transparentproxy/iptables/builder/builder_table_mangle.go
	renamed:    pkg/transparentproxy/iptables/builder/builder_nat.go -> pkg/transparentproxy/iptables/builder/builder_table_nat.go
	renamed:    pkg/transparentproxy/iptables/builder/builder_nat_test.go -> pkg/transparentproxy/iptables/builder/builder_table_nat_test.go
	renamed:    pkg/transparentproxy/iptables/builder/builder_raw.go -> pkg/transparentproxy/iptables/builder/builder_table_raw.go
	modified:   pkg/transparentproxy/iptables/commands/command.go
	new file:   pkg/transparentproxy/iptables/parameters/noflush.go
	modified:   pkg/transparentproxy/iptables/parameters/parameters.go
	new file:   pkg/transparentproxy/iptables/parameters/wait.go
	new file:   pkg/transparentproxy/iptables/parameters/wait_interval.go
	new file:   pkg/transparentproxy/iptables/parameters/wait_interval_test.go
	new file:   pkg/transparentproxy/iptables/parameters/wait_test.go
	modified:   pkg/transparentproxy/transparentproxy_v2.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   api/mesh/v1alpha1/externalservice.pb.go
	both modified:   api/mesh/v1alpha1/externalservice.proto
	both modified:   docs/generated/resources/policy_external-service.md
	deleted by us:   pkg/insights/globalinsight/testdata/full_global_insight.golden.json

…n installing tproxy fails (#7870)

Signed-off-by: Bart Smykla <bartek@smykla.com>
@kumahq kumahq bot requested a review from a team as a code owner September 27, 2023 07:46
@kumahq kumahq bot requested review from michaelbeaumont and lobkovilya and removed request for a team September 27, 2023 07:46
Signed-off-by: Bart Smykla <bartek@smykla.com>
@bartsmykla bartsmykla enabled auto-merge (squash) September 27, 2023 08:16
@bartsmykla
Copy link
Contributor

/format

github-actions bot and others added 2 commits September 27, 2023 08:49
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@bartsmykla bartsmykla merged commit 26eaf5a into release-2.4 Sep 27, 2023
5 checks passed
@bartsmykla bartsmykla deleted the chore/backport-release-2.4-7870 branch September 27, 2023 09:19
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