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.

Sign up for GitHub

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

Jump to bottom

cilium: completion of nat46/64 gateway #22421

Merged
merged 8 commits into from
Dec 16, 2022
Merged

cilium: completion of nat46/64 gateway #22421

merged 8 commits into from
Dec 16, 2022

Conversation

borkmann
Copy link
Member

(see commit msgs)

@borkmann borkmann added sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. release-note/misc This PR makes changes that have no direct user impact. release-note/major This PR introduces major new functionality to Cilium. labels Nov 29, 2022
@borkmann borkmann force-pushed the pr/gw-full branch 12 times, most recently from 73c610e to eed5e23 Compare December 6, 2022 13:12
@borkmann borkmann force-pushed the pr/gw-full branch 15 times, most recently from de6db5a to 9d4e08f Compare December 7, 2022 14:37
@borkmann
cilium: Move default nat46x64 prefix into defaults package
e14108e 
Refactor the code such that we can easily expose it as a config knob and
have the underlying code be generic.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
@borkmann
cilium: Remove unneeded CIDR nil check
a73dd46 
This cannot be true if err == nil and can also be removed in
validateIPv6ClusterAllocCIDR.

Also, s/CIDR length must be/prefix length must be/.

Suggested-by: Timo Beckers <timo@isovalent.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
@borkmann
cilium: Use netip.Addr for IPv6NAT46x64CIDRBase
a3bda3f 
For new code, preference is to use net/netip package.

Suggested-by: Timo Beckers <timo@isovalent.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
@borkmann
Copy link
Member Author

/test

@borkmann
Copy link
Member Author

(rebased)

@borkmann borkmann mentioned this pull request Dec 16, 2022
Closed
2 tasks
@borkmann
Copy link
Member Author

(runtime test has panic: close of closed channel (#22761))

@borkmann
Copy link
Member Author

(CI green)

@borkmann
Copy link
Member Author

(l4lb passed as well)

@borkmann borkmann added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Dec 16, 2022
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.13.0-rc4 Dec 16, 2022
@borkmann borkmann merged commit d8c7d93 into master Dec 16, 2022
@borkmann borkmann deleted the pr/gw-full branch December 16, 2022 16:10
@joestringer joestringer mentioned this pull request Dec 21, 2022
Merged
@joestringer joestringer added the backport/author The backport will be carried out by the author of the PR. label Dec 22, 2022
@joestringer joestringer added this to Needs backport from master in 1.13.0-rc5 Dec 22, 2022
@joestringer joestringer removed this from Needs backport from master in 1.13.0-rc4 Dec 22, 2022
@margamanterola
Copy link
Member

@borkmann This PR didn't get backported to 1.13 due to conflicts and thus didn't get released in RC4 last week. Are we intending to get this merged into 1.13, or will this only land in 1.14?

@borkmann
Copy link
Member Author

@borkmann This PR didn't get backported to 1.13 due to conflicts and thus didn't get released in RC4 last week. Are we intending to get this merged into 1.13, or will this only land in 1.14?

They are marked for 1.13, so yeah they need to hit the final 1.13 release. Worst case I can help with backport once back.

@borkmann borkmann mentioned this pull request Jan 5, 2023
Merged
@borkmann borkmann added backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. and removed needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch labels Jan 5, 2023
@borkmann borkmann added backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. and removed backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. labels Jan 13, 2023
@joestringer joestringer moved this from Needs backport from master to Backport done to v1.13 in 1.13.0-rc5 Jan 24, 2023
@joestringer joestringer mentioned this pull request Jan 24, 2023
Merged
@qmonnet qmonnet mentioned this pull request Mar 15, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brb brb brb left review comments

@aspsk aspsk aspsk left review comments

@oblazek oblazek oblazek left review comments

@gandro gandro gandro approved these changes

@tklauser tklauser tklauser approved these changes

@joestringer joestringer joestringer approved these changes

@ti-mo ti-mo ti-mo approved these changes

@nathanjsweet nathanjsweet Awaiting requested review from nathanjsweet nathanjsweet was automatically assigned from cilium/api

Assignees
No one assigned
Labels
backport/author The backport will be carried out by the author of the PR. backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-blocker/1.13 This issue will prevent the release of the next version of Cilium. release-note/major This PR introduces major new functionality to Cilium. release-note/misc This PR makes changes that have no direct user impact. sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages.
Projects
No open projects
1.13.0-rc5
Backport done to v1.13
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@borkmann @margamanterola @gandro @brb @tklauser @joestringer @ti-mo @aspsk @oblazek @aanm