cilium: sock termination fixes #39800
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is just forward-porting commit d3c80fa ("SocketLB: Terminate connections for services with mixed protocols") given it has been missing in the new control plane. Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
filterAndDestroyUDPSockets has family as an argument, but iterateNetlinkSockets kept hard-coding syscall.AF_INET as input. Pass the right family along instead of the latter. It seems this was an oversight from refactoring in commit c7760bd ("sockets: use general purpose iterateNetlinkSockets function.") Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
|
/test |
joamaki
approved these changes
Jun 2, 2025
| @@ -184,7 +184,7 @@ func terminateUDPConnectionsToBackend(p socketTerminationParams, l3n4Addr lb.L3n | |||
| l4Addr := l3n4Addr.L4Addr | |||
|
|
|||
| switch l3n4Addr.Protocol { | |||
| case lb.UDP: | |||
| case lb.UDP, lb.ANY: | |||
There was a problem hiding this comment.
lb.ANY should be impossible with the new control-plane as at least currently you can't turn off "protocol differentiation". But good to add this still as we might still end up adding the ability to turn it off...
There was a problem hiding this comment.
Ah ok, but what happens when people upgrade and they still have old ANY entries in the maps where then the backend goes away?
There was a problem hiding this comment.
Those are removed by the reconciler once the maps have been populated with the new entries.
There was a problem hiding this comment.
Those are removed by the reconciler once the maps have been populated with the new entries.
tommyp1ckles
approved these changes
Jun 2, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(see individual commit msgs)