fix: Windows CNI Overlay Gateway Bug #1849
Merged
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
jaer-tsun
force-pushed
the
tsch/fixOverlayGwBug
branch
from
82951ac
to
b912dde
Compare
tamilmani1989
requested changes
Mar 13, 2023
cni/network/invoker_cns.go
Outdated
Comment on lines
113
to
116
| ncgw = ncipnet.IP.Mask(ncipnet.Mask) | ||
| ncgw[3]++ | ||
| if !ncipnet.Contains(ncgw) { | ||
| return IPAMAddResult{}, errors.Wrap(errInvalidArgs, "%w: Invalid gateway address "+ncgw.String()) | ||
| } |
There was a problem hiding this comment.
can we scope this change only for windows and return overlayGWIP for linux as like before to make sure not introducing new change in linux?
There was a problem hiding this comment.
we were passing 169.254.1.1 to linux before too, and we just tested this change and it's working
There was a problem hiding this comment.
scoped to windows now
added 5 commits
March 14, 2023 16:23
… initializing node because it couldn't reach IMDS
jaer-tsun
force-pushed
the
tsch/fixOverlayGwBug
branch
from
1c8c937
to
63e37a2
Compare
cni/network/network.go
Outdated
| @@ -538,7 +538,7 @@ func (plugin *NetPlugin) Add(args *cniSkel.CmdArgs) error { | |||
| logAndSendEvent(plugin, fmt.Sprintf("[cni-net] Created network %v with subnet %v.", networkID, ipamAddResult.hostSubnetPrefix.String())) | |||
| } | |||
|
|
|||
| natInfo := getNATInfo(nwCfg.ExecutionMode, options[network.SNATIPKey], nwCfg.MultiTenancy, enableSnatForDNS) | |||
| natInfo := getNATInfo(nwCfg.ExecutionMode, nwCfg.IPAM.Mode, options[network.SNATIPKey], nwCfg.MultiTenancy, enableSnatForDNS) | |||
There was a problem hiding this comment.
can pass nwCfg pointer instead of individual fields
cni/network/network_windows.go
Outdated
| func getNATInfo(executionMode string, ncPrimaryIPIface interface{}, multitenancy, enableSnatForDNS bool) (natInfo []policy.NATInfo) { | ||
| if executionMode == string(util.V4Swift) { | ||
| func getNATInfo(executionMode, ipamMode string, ncPrimaryIPIface interface{}, multitenancy, enableSnatForDNS bool) (natInfo []policy.NATInfo) { | ||
| if executionMode == string(util.V4Swift) && ipamMode != string(util.V4Overlay) { |
There was a problem hiding this comment.
can you add UT for this scenario for overlay vs podsubnet?
tamilmani1989
changed the title
| @@ -1068,3 +1079,9 @@ func TestGetNetworkName(t *testing.T) { | |||
| }) | |||
| } | |||
| } | |||
|
|
|||
| func TestGetOverlayNatInfo(t *testing.T) { | |||
| nwCfg := &cni.NetworkConfig{ExecutionMode: string(util.V4Swift), IPAM: cni.IPAM{Mode: string(util.V4Overlay)}} | |||
There was a problem hiding this comment.
can you also add one case for swift podsubnet?
Comment on lines
+415
to
+417
| ncgw := podsubnet.IP | ||
| ncgw[3]++ | ||
| ncgw = net.ParseIP(ncgw.String()) |
There was a problem hiding this comment.
check this out: https://stackoverflow.com/a/31191775
There was a problem hiding this comment.
we're passing the IP from net.IPNet instead of podip
tamilmani1989
approved these changes
Mar 15, 2023
3 tasks
jpayne3506
pushed a commit
that referenced
this pull request
Sep 11, 2023
* fix overlay gatway bug that prevented cloud-node-manager-windows from initializing node because it couldn't reach IMDS * add overlay invoker cns test * use parseip instead of mask * scope CNI overlay gateway bug fix to windows only * update test * adding UT to verify overlay NAT info is empty * add podsubnet netInfo test --------- Co-authored-by: Jaeryn <tsun.chu@microsoft.com> (cherry picked from commit dac5b31)
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.
Reason for Change:
Fixing overlay gateway bug that prevented cloud-node-manager-windows from initializing node because it couldn't reach IMDS. An additional VFP rule was implicitly plumbed by HNS to add 169.254.1.1/16 to the exception list. This is most likely based off the RouteConfiguration in the "azure" HNS network. This additional VFP rule was skipping SNAT for any IP address in this range 169.254.0.0-169.254.255.255. We'll set the first .1 IP of podcidr as the gateway now.
Issue Fixed:
Requirements:
Notes: