refactor: Modify CNI to Support AKS-Swift #1076
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
jaer-tsun
force-pushed
the
refactor-ipam-add
branch
11 times, most recently
from
71ec584 to
4ee008d
Compare
jaer-tsun
force-pushed
the
refactor-ipam-add
branch
from
4ee008d to
fa50928
Compare
tamilmani1989
requested changes
Nov 18, 2021
jaer-tsun
force-pushed
the
refactor-ipam-add
branch
3 times, most recently
from
86c0396 to
890f7a5
Compare
cni/network/invoker_cns.go
Outdated
| errInvalidArgs = errors.New("invalid arg(s)") | ||
| ) | ||
|
|
||
| const ( |
jaer-tsun
force-pushed
the
refactor-ipam-add
branch
from
890f7a5 to
1e17642
Compare
tamilmani1989
requested changes
Nov 23, 2021
Member
tamilmani1989
left a comment
tamilmani1989
left a comment
There was a problem hiding this comment.
added a comment + we have to test this in both windows multitenancy and linux multitenancy before merge
jaer-tsun
force-pushed
the
refactor-ipam-add
branch
8 times, most recently
from
4f52d2c to
4ddfae3
Compare
jaer-tsun
force-pushed
the
refactor-ipam-add
branch
6 times, most recently
from
73e4d6a to
d68ace3
Compare
jaer-tsun
force-pushed
the
refactor-ipam-add
branch
from
d68ace3 to
ee1a2fc
Compare
tamilmani1989
requested changes
Mar 16, 2022
cni/network/network.go
Outdated
| if nwCfg.MultiTenancy { | ||
| cnsclient, er := cnscli.New(nwCfg.CNSUrl, defaultRequestTimeout) | ||
| if err != nil { | ||
| cnsClient, er := cnscli.New(nwCfg.CNSUrl, defaultRequestTimeout) |
Member
There was a problem hiding this comment.
i didnt see you addressed this?
cni/network/network.go
Outdated
| if err != nil { | ||
| log.Printf("GetMultiTenancyCNIResult failed with error %v", err) | ||
| return fmt.Errorf("GetMultiTenancyCNIResult failed:%w", err) | ||
| ipamAddResult.ipv4Result, ipamAddResult.ncResponse, ipamAddResult.hostSubnetPrefix, er = plugin.multitenancyClient.GetContainerNetworkConfiguration( |
Member
There was a problem hiding this comment.
should not be returning result from GetContainerNetworkConfiguration as we discussed in call
Contributor
Author
There was a problem hiding this comment.
why are we changing the return here? (we use it throughout the rest of func and the call didn't explain why)
Contributor
Author
There was a problem hiding this comment.
removed and added conversion underneath via convertToCniResult
cni/network/network.go
Outdated
|
|
||
| plugin.report.Context = "AzureCNIMultitenancy" | ||
| plugin.multitenancyClient.Init(cnsClient, AzureNetIOShim{}) | ||
| plugin.ipamInvoker = NewCNSInvoker(k8sPodName, k8sNamespace, cnsClient, plugin.multitenancyClient) |
Member
There was a problem hiding this comment.
remove this line if not used
tamilmani1989
requested changes
Mar 17, 2022
jaer-tsun
force-pushed
the
refactor-ipam-add
branch
4 times, most recently
from
324f07f to
848a9ab
Compare
cni/network/invoker_cns.go
Outdated
| return IPAMAddResult{}, err | ||
| } | ||
|
|
||
| // first result is ipv4, second is ipv6, SWIFT doesn't currently support IPv6 |
Contributor
Author
There was a problem hiding this comment.
removed this comment since it's already mentioned when describing func
cni/network/network.go
Outdated
| log.Printf("Result from multitenancy %+v", result) | ||
| ipamAddResult.ipv4Result = convertToCniResult(ipamAddResult.ncResponse, args.IfName) | ||
|
|
||
| log.Printf("PrimaryInterfaceIdentifier :%v", ipamAddResult.hostSubnetPrefix.IP.String()) |
Member
There was a problem hiding this comment.
can we print ipv4result as well? Also make sure we print network config received from cns
jaer-tsun
force-pushed
the
refactor-ipam-add
branch
from
848a9ab to
def2f90
Compare
jaer-tsun
force-pushed
the
refactor-ipam-add
branch
from
def2f90 to
ff81fb7
Compare
Contributor
Author
|
pending windows e2e multitenancy tests |
3 tasks
tamilmani1989
approved these changes
Apr 1, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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:
Slight refactoring of multi tenant CNI bits to support AKS-Swift on Windows
Requirements:
Notes: