fix: Pass host gateway to CNI in swift mode #695
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
Codecov Report
@@ Coverage Diff @@
## master #695 +/- ##
==========================================
- Coverage 38.56% 38.52% -0.05%
==========================================
Files 79 79
Lines 10446 10460 +14
==========================================
+ Hits 4029 4030 +1
- Misses 5925 5938 +13
Partials 492 492 |
vakalapa
reviewed
Oct 19, 2020
| if client.nwInfo.IPAMType == AzureCNS { | ||
|
|
||
| // Add snat Rules | ||
| gwIP := client.nwInfo.Options[SNATIPKey] |
Contributor
There was a problem hiding this comment.
HostGWKey ? instead of SNATIPKey
paulgmiller
reviewed
Oct 20, 2020
| nlRoute := &netlink.Route{ | ||
| Family: family, | ||
| Dst: &client.nwInfo.PodSubnet.Prefix, | ||
| Gw: Ipv4DefaultRouteDstPrefix.IP, |
Member
There was a problem hiding this comment.
Seems like instead of adding a rule we're replacing a rule. Also what is the podsubnet here is it actually the node subnet (what I would think of in aks-rp as vnetsubnetid given to aks?)
neaggarwMS
requested changes
Oct 20, 2020
| return fmt.Errorf("Invalid host gateway IP: %+v", gwIP) | ||
| } | ||
|
|
||
| // add pod subnet to host |
| func (client *LinuxBridgeClient) AddRoutes(nwInfo *NetworkInfo, interfaceName string) error { | ||
| if client.nwInfo.IPAMType == AzureCNS { | ||
|
|
||
| // Add snat Rules |
Member
There was a problem hiding this comment.
Can you fix the comment, we are adding a ip route with VM nic's gateway address
neaggarwMS
previously approved these changes
Oct 20, 2020
neaggarwMS
approved these changes
Oct 21, 2020
matmerr
added a commit
that referenced
this pull request
Nov 12, 2020
* fix: pass host gateway to cni in swift mode * hostgwkey * update comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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:
In swift mode the route for host to pod on other host needs to go via the default gateway, so we add a route to the bridge for the pod subnet to use the host default gateway
Issue Fixed:
Requirements:
Notes: