Use peer's wireguard port, not our own #2200
Open
Conversation
This file contains 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
Before this change, the wireguard code constructed a peer endpoint via "PeerIP + n.dev.listenPort", i.e. we used the peer's IP, but our port. This works fine if every k8s node has the same ListenPort, which is admittedly the common setup... However, some people may desire to use different ports for some cases, and in that case, we should respect that different port. I've manually tested that this works in my cluster, where 1 node has different ports for wireguard from all the others. After deploying this diff to each node, I get a working pod network.
euank
commented
Mar 10, 2025
| if n.mode == Ipv4 { | ||
| publicEndpoint = fmt.Sprintf("%s:%d", event.Lease.Attrs.PublicIP.String(), n.dev.attrs.listenPort) | ||
| } else if n.mode == Ipv6 { | ||
| publicEndpoint = fmt.Sprintf("[%s]:%d", event.Lease.Attrs.PublicIPv6.String(), n.dev.attrs.listenPort) |
There was a problem hiding this comment.
This line had an additional bug of using the ipv6 IP + ipv4 port, so I think this probably wouldn't generally work.
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.
Description
Before this change, the wireguard code constructed a peer endpoint via "PeerIP + n.dev.listenPort", i.e. we used the peer's IP, but our port.
This works fine if every k8s node has the same ListenPort, which is admittedly the common setup...
However, some people may desire to use different ports for some cases, and in that case, we should respect that different port.
I've manually tested that this works in my cluster, where 1 node has different ports for wireguard from all the others.
After deploying this diff to each node, I get a working pod network.
Note: I believe this is a bugfix which shouldn't break any properly configured setups, so I didn't add an opt-in or opt-out to it. I'm happy to add an opt-in flag if we can think of any reasonable setup this would break.
Release Note