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: Repoint netlink lib back to upstream. #26359

Merged
merged 2 commits into from Jun 20, 2023
Merged

cilium: Repoint netlink lib back to upstream. #26359

merged 2 commits into from Jun 20, 2023

Conversation

borkmann
Copy link
Member

See commit messages.

@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. labels Jun 19, 2023
@borkmann borkmann requested review from a team as code owners June 19, 2023 14:50
@borkmann
vendor: Update vishvananda/netlink/
cbb9de2 
Update vishvananda/netlink and point it back to its upstream location instead
of our local Cilium repo.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
@borkmann
cilium: Unbreak updateDevicesFromRoutes route.Dst check
9cf5508 
Referenced vishvananda/netlink breaks Cilium as it stops propagating
route.Dst == nil, but instead generates a zero net for these. Therefore
update the test in the device manager to fix it again, so that we do not
need to rely on the Cilium-based fork with revert of mentioned commit.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: vishvananda/netlink@acdc658
@borkmann
Copy link
Member Author

/test

tklauser
tklauser approved these changes Jun 19, 2023
View reviewed changes
Copy link
Member

@tklauser tklauser left a comment

Choose a reason for hiding this comment

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

Nice, thanks!

@borkmann borkmann added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jun 20, 2023
@borkmann borkmann merged commit 2716ff7 into main Jun 20, 2023
61 of 63 checks passed
@borkmann borkmann deleted the pr/fix-repoint-nl branch June 20, 2023 07:33
@joestringer joestringer mentioned this pull request Jun 28, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tklauser tklauser tklauser approved these changes

@dylandreimerink dylandreimerink dylandreimerink approved these changes

@joamaki joamaki Awaiting requested review from joamaki

Assignees
No one assigned
Labels
ready-to-merge This PR has passed all tests and received consensus from code owners to merge. 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
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@borkmann @tklauser @dylandreimerink