feat(transparent-proxy): allow to wait for xtables lock and retry when installing tproxy fails #7870

bartsmykla · 2023-09-26T10:43:39Z

Allow to wait for xtables lock when something else is holding it concurrently with us + retry when tproxy installation fails

Checklist prior to review

Link to relevant issue as well as docs and UI issues
- Closes: Iptables locked and is not retried #7823
This will not break child repos: it doesn't hardcode values (.e.g "kumahq" as a image registry) and it will work on Windows, system specific functions like syscall.Mkfifo have equivalent implementation on the other OS
- It won't
Tests (Unit test, E2E tests, manual test on universal and k8s)
- manually tested and unit tests updated
Do you need to update UPGRADE.md?
- There is no need
Does it need to be backported according to the backporting policy? (this GH action will add "backport" label based on these file globs, if you want to prevent it from adding the "backport" label use no-backport-autolabel label)
Do you need to explicitly set a > Changelog: entry here or add a ci/ label to run fewer/more tests?

It allows to introduce different type of builder, like builder-restore Signed-off-by: Bart Smykla <bartek@smykla.com>

Signed-off-by: Bart Smykla <bartek@smykla.com>

When --wait was placed before the filename, it was treated as if the filename was value of the flag Signed-off-by: Bart Smykla <bartek@smykla.com>

Only legacy version (non-nftables) allow to use `--wait` and `--wait-interval` flags Signed-off-by: Bart Smykla <bartek@smykla.com>

Signed-off-by: Bart Smykla <bartek@smykla.com>

…t-and-retry-when-installing-tproxy

bartsmykla · 2023-09-26T10:48:24Z

/format

slonka · 2023-09-26T11:44:16Z

@bartsmykla format does not work #7870 (comment)

EDIT: pushed a commit that should make it work, hope you don't mind, if you do, let me know

lahabana · 2023-09-26T11:49:33Z

Here's the issue: #7873

Signed-off-by: slonka <slonka@users.noreply.github.com>

slonka

Couple of questions around switches

app/kumactl/cmd/install/install_transparent_proxy.go

pkg/transparentproxy/config/config.go

Signed-off-by: Bart Smykla <bartek@smykla.com>

…t-and-retry-when-installing-tproxy Signed-off-by: Bart Smykla <bartek@smykla.com>

Signed-off-by: Bart Smykla <bartek@smykla.com>

slonka

All good apart from one discrepancy

app/kumactl/cmd/install/install_transparent_proxy.go

Signed-off-by: Bart Smykla <bartek@smykla.com>

…t-and-retry-when-installing-tproxy

bartsmykla · 2023-09-27T06:10:40Z

/format

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

bartsmykla · 2023-09-27T06:38:30Z

/format

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

github-actions · 2023-09-27T07:46:09Z

backporting to release-2.2 with action

backporting to release-2.4 with action
backporting to release-2.0 with action

github-actions · 2023-09-27T07:46:09Z

backporting to release-2.1 with action

…n installing tproxy fails (#7870) Signed-off-by: Bart Smykla <bartek@smykla.com>

lahabana · 2023-09-27T08:13:30Z

api/mesh/v1alpha1/externalservice.proto

@@ -55,7 +55,8 @@ message ExternalService {
      // The default value is set to "address" specified in "networking".
      google.protobuf.StringValue server_name = 6;

-      // If true then hostname verification will be skipped during certificate verification.
+      // If true then hostname verification will be skipped during certificate
+      // verification.


Would be nice to not change unrelated files in the future

…n installing tproxy fails (backport of #7870) (#7892) Signed-off-by: Bart Smykla <bartek@smykla.com>

bartsmykla added 15 commits September 26, 2023 08:14

chore: rename iptables table builder files

1fe48dd

It allows to introduce different type of builder, like builder-restore Signed-off-by: Bart Smykla <bartek@smykla.com>

chore: add --noflush, --wait and --wait-interval parameters

02571a3

Signed-off-by: Bart Smykla <bartek@smykla.com>

chore: allow *Parameter to be nil when calling Build

9a78e0e

Signed-off-by: Bart Smykla <bartek@smykla.com>

chore: add convenience abstraction Parameters -> []*Parameter

57d8a45

Signed-off-by: Bart Smykla <bartek@smykla.com>

chore: adjust warnings and messages printed when installing tproxy

b551020

Signed-off-by: Bart Smykla <bartek@smykla.com>

chore: create iptables related string consts

fdac210

Signed-off-by: Bart Smykla <bartek@smykla.com>

chore: introduce iptables-restore builder

ec3d67e

Signed-off-by: Bart Smykla <bartek@smykla.com>

chore: allow to specify --wait and --wait-interval flags

17372e6

Signed-off-by: Bart Smykla <bartek@smykla.com>

chore: add append methods to Parameters type

ff3b803

Signed-off-by: Bart Smykla <bartek@smykla.com>

chore: set --noflush flag at the end

de8897f

When --wait was placed before the filename, it was treated as if the filename was value of the flag Signed-off-by: Bart Smykla <bartek@smykla.com>

chore: check if iptables-restore are legacy

a872235

Only legacy version (non-nftables) allow to use `--wait` and `--wait-interval` flags Signed-off-by: Bart Smykla <bartek@smykla.com>

chore: introduce the logic to retry tproxy installation

4c9491e

Signed-off-by: Bart Smykla <bartek@smykla.com>

chore: add retry related flags and fix tests

5c79e02

Signed-off-by: Bart Smykla <bartek@smykla.com>

chore: update golden files

40626d8

Signed-off-by: Bart Smykla <bartek@smykla.com>

Merge remote-tracking branch 'upstream/master' into feat/allow-to-wai…

dc759d8

…t-and-retry-when-installing-tproxy

bartsmykla requested a review from a team as a code owner September 26, 2023 10:43

bartsmykla requested review from michaelbeaumont and lukidzi and removed request for a team September 26, 2023 10:43

bartsmykla added the backport label Sep 26, 2023

feat(transparent-proxy): make lint happy

2c0ba8a

Signed-off-by: slonka <slonka@users.noreply.github.com>

slonka reviewed Sep 26, 2023

View reviewed changes

app/kumactl/cmd/install/install_transparent_proxy.go Show resolved Hide resolved

app/kumactl/cmd/install/install_transparent_proxy.go Outdated Show resolved Hide resolved

pkg/transparentproxy/config/config.go Outdated Show resolved Hide resolved

bartsmykla added 5 commits September 27, 2023 05:52

chore: get rid of RestoreLegacy property from the config

f8035a7

Signed-off-by: Bart Smykla <bartek@smykla.com>

chore: set default --wait to 5 + update golden files

3a61f1e

Signed-off-by: Bart Smykla <bartek@smykla.com>

chore: flag --wait has to have value assigned with "=" and not " "

fc194df

Signed-off-by: Bart Smykla <bartek@smykla.com>

chore: add comment about connector

3a357ad

Signed-off-by: Bart Smykla <bartek@smykla.com>

Merge remote-tracking branch 'upstream/master' into feat/allow-to-wai…

097f8b4

…t-and-retry-when-installing-tproxy Signed-off-by: Bart Smykla <bartek@smykla.com>

bartsmykla requested a review from slonka September 27, 2023 04:33

fix: use ipv6 parameter instead of taking it from the config

3fe769f

Signed-off-by: Bart Smykla <bartek@smykla.com>

slonka approved these changes Sep 27, 2023

View reviewed changes

app/kumactl/cmd/install/install_transparent_proxy.go Outdated Show resolved Hide resolved

bartsmykla added 2 commits September 27, 2023 07:44

chore: fix --wait flag comment

6e6cb2a

Signed-off-by: Bart Smykla <bartek@smykla.com>

Merge remote-tracking branch 'upstream/master' into feat/allow-to-wai…

fe8786e

…t-and-retry-when-installing-tproxy

fix(ci): format files

4abe123

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

fix(ci): format files

98300f0

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

bartsmykla closed this Sep 27, 2023

bartsmykla reopened this Sep 27, 2023

bartsmykla merged commit 078c2ef into kumahq:master Sep 27, 2023
9 checks passed

bartsmykla deleted the feat/allow-to-wait-and-retry-when-installing-tproxy branch September 27, 2023 07:45

kumahq bot pushed a commit that referenced this pull request Sep 27, 2023

feat(transparent-proxy): allow to wait for xtables lock and retry whe…

ae94cc4

…n installing tproxy fails (#7870) Signed-off-by: Bart Smykla <bartek@smykla.com>

kumahq bot pushed a commit that referenced this pull request Sep 27, 2023

feat(transparent-proxy): allow to wait for xtables lock and retry whe…

c62c9e9

…n installing tproxy fails (#7870) Signed-off-by: Bart Smykla <bartek@smykla.com>

kumahq bot pushed a commit that referenced this pull request Sep 27, 2023

feat(transparent-proxy): allow to wait for xtables lock and retry whe…

6b29789

…n installing tproxy fails (#7870) Signed-off-by: Bart Smykla <bartek@smykla.com>

kumahq bot pushed a commit that referenced this pull request Sep 27, 2023

feat(transparent-proxy): allow to wait for xtables lock and retry whe…

4dd320a

…n installing tproxy fails (#7870) Signed-off-by: Bart Smykla <bartek@smykla.com>

kumahq bot mentioned this pull request Sep 27, 2023

feat(transparent-proxy): allow to wait for xtables lock and retry when installing tproxy fails (backport of #7870) #7893

Closed

kumahq bot pushed a commit that referenced this pull request Sep 27, 2023

feat(transparent-proxy): allow to wait for xtables lock and retry whe…

1db92db

…n installing tproxy fails (#7870) Signed-off-by: Bart Smykla <bartek@smykla.com>

lahabana reviewed Sep 27, 2023

View reviewed changes

bartsmykla pushed a commit that referenced this pull request Sep 27, 2023

feat(transparent-proxy): allow to wait for xtables lock and retry whe…

26eaf5a

…n installing tproxy fails (backport of #7870) (#7892) Signed-off-by: Bart Smykla <bartek@smykla.com>

BrewTestBot mentioned this pull request Nov 15, 2023

kumactl 2.5.0 Homebrew/homebrew-core#154429

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(transparent-proxy): allow to wait for xtables lock and retry when installing tproxy fails #7870

feat(transparent-proxy): allow to wait for xtables lock and retry when installing tproxy fails #7870

bartsmykla commented Sep 26, 2023 •

edited

Loading

bartsmykla commented Sep 26, 2023

slonka commented Sep 26, 2023 •

edited

Loading

lahabana commented Sep 26, 2023

slonka left a comment

slonka left a comment

bartsmykla commented Sep 27, 2023

bartsmykla commented Sep 27, 2023

github-actions bot commented Sep 27, 2023 •

edited

Loading

github-actions bot commented Sep 27, 2023

lahabana Sep 27, 2023

feat(transparent-proxy): allow to wait for xtables lock and retry when installing tproxy fails #7870

feat(transparent-proxy): allow to wait for xtables lock and retry when installing tproxy fails #7870

Conversation

bartsmykla commented Sep 26, 2023 • edited Loading

Checklist prior to review

bartsmykla commented Sep 26, 2023

slonka commented Sep 26, 2023 • edited Loading

lahabana commented Sep 26, 2023

slonka left a comment

Choose a reason for hiding this comment

slonka left a comment

Choose a reason for hiding this comment

bartsmykla commented Sep 27, 2023

bartsmykla commented Sep 27, 2023

github-actions bot commented Sep 27, 2023 • edited Loading

github-actions bot commented Sep 27, 2023

lahabana Sep 27, 2023

Choose a reason for hiding this comment

bartsmykla commented Sep 26, 2023 •

edited

Loading

slonka commented Sep 26, 2023 •

edited

Loading

github-actions bot commented Sep 27, 2023 •

edited

Loading