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

v1.13 Backports 2023-06-26 #26477

Merged
merged 10 commits into from
Jun 29, 2023
Merged

v1.13 Backports 2023-06-26 #26477

merged 10 commits into from
Jun 29, 2023

Conversation

jibi
Copy link
Member

@jibi jibi commented Jun 26, 2023

Once this PR is merged, you can update the PR labels via:

for pr in 25932,26376; do contrib/backporting/set-labels.py $pr done 1.13; done

or with

make add-labels BRANCH=v1.13 ISSUES=25932,26376

julianwiedmann and others added 2 commits June 26, 2023 10:51
[ upstream commit e4d277c ]

In a config with native routing, the nodeport code in rev_nodeport_lb4()
immediately redirects EgressGW reply traffic into the tunnel towards the
client node.

Test that this works in combination with TC.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit d511b55 ]

this new type will be used in a subsequent commit to identify the
context of each individual egress gateway test.

Also rename tc_egressgw_snat2_reply to tc_egressgw_snat1_2_reply as
tests 1 and 2 share the same context

Signed-off-by: Gilberto Bertin <jibi@cilium.io>
@jibi jibi added kind/backports This PR provides functionality previously merged into master. backport/1.13 This PR represents a backport for Cilium 1.13.x of a PR that was merged to main. labels Jun 26, 2023
jibi added 8 commits June 26, 2023 10:59
[ upstream commit 253b5e8 ]

this is to decouple it from the reply parameter and make it more
generic, in preparation for a new test

Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit 6376158 ]

otherwise different tests will share and reuse the same NAT/CT entries,
causing unexpected results due to the existing connections

Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit e5a496a ]

and use them to always clean up egress gateway policies after each test
run

Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit d458551 ]

these helpers are used to install and remove an allow policy in the
egressgw redirect tests to avoid packets being dropped

Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit 45fc79c ]

since egressgw_snat_check has reached a high number of parameters,
introduce a new egressgw_test_ctx struct that describes the context of a
test/check, and use that as parameter of the egressgw_snat_{pktgen,snat}
helpers

Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit 6ff3216 ]

this should make it a bit more explicit what the test is doing

Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit b12114c ]

and rename egressgw_snat_pktgen to egressgw_pktgen, to reuse it in
tc_egressgw_redirect.c and xdp_egressgw_reply.c

Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit 85388ee ]

which is used to verify that a test returned a given action

Signed-off-by: Gilberto Bertin <jibi@cilium.io>
@jibi jibi force-pushed the pr/v1.13-backport-2023-06-26 branch from 0414eed to 80cdd30 Compare June 26, 2023 08:59
@jibi
Copy link
Member Author

jibi commented Jun 26, 2023

/test-backport-1.13

@jibi jibi requested a review from julianwiedmann June 26, 2023 09:39
@jibi jibi marked this pull request as ready for review June 26, 2023 09:39
@jibi jibi requested a review from a team as a code owner June 26, 2023 09:39
Copy link
Member

@julianwiedmann julianwiedmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks! Dropping the XDP test makes sense, tunnel from XDP worked very different in v1.13.

@jibi
Copy link
Member Author

jibi commented Jun 28, 2023

/test-1.18-4.19

@jibi
Copy link
Member Author

jibi commented Jun 28, 2023

/test-1.20-4.19

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jun 29, 2023
@jibi jibi merged commit f18bf83 into v1.13 Jun 29, 2023
61 checks passed
@jibi jibi deleted the pr/v1.13-backport-2023-06-26 branch June 29, 2023 12:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.13 This PR represents a backport for Cilium 1.13.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants