refactor(windows): win-bridge #617
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
thxCode
force-pushed
the
refactor_win_bridge
branch
2 times, most recently
from
222fe58
to
87758ff
Compare
This was referenced Apr 19, 2021
thxCode
force-pushed
the
refactor_win_bridge
branch
3 times, most recently
from
07a8a55
to
1a06c1e
Compare
thxCode
changed the title
|
looks okay on a quick glance, but let run through this more in depth |
dcbw
reviewed
May 19, 2021
|
hi ! im gonna try to get some context for this .... |
thxCode
force-pushed
the
refactor_win_bridge
branch
3 times, most recently
from
436a4cd
to
e1f5c37
Compare
|
anfernee
reviewed
May 20, 2021
nagiesek
approved these changes
May 25, 2021
dcantah
reviewed
May 26, 2021
dcantah
reviewed
May 26, 2021
| if strings.EqualFold(hnsEndpoint.VirtualNetwork, epInfo.NetworkId) { | ||
| return nil, fmt.Errorf("HNSEndpoint %s is already existed", epInfo.EndpointName) | ||
| } | ||
| // remove endpoint if corrupted |
There was a problem hiding this comment.
What constitutes the endpoint being corrupted in this case?
There was a problem hiding this comment.
I think the endpoint is corrupted if it has the same name but mounted on the other network.
- format function names - add/remove comments - adjust message of error Signed-off-by: thxcode <[email protected]>
- group functions by HNS,HCN Signed-off-by: thxcode <[email protected]>
Signed-off-by: thxcode <[email protected]>
Signed-off-by: thxcode <[email protected]>
thxCode
force-pushed
the
refactor_win_bridge
branch
2 times, most recently
from
cffe767
to
9f802c2
Compare
- support v2 api - unify v1 and v2 api BREAKING CHANGE: - remove `HcnPolicyArgs` field - merge `HcnPolicyArgs` into `Policies` field Signed-off-by: thxcode <[email protected]>
thxCode
force-pushed
the
refactor_win_bridge
branch
from
9f802c2
to
4b180a9
Compare
|
Thanks for all the reviews and work. |
7 tasks
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.
There are some problems with
win-bridgeplugin at present, i.e: unclear error message, unclear function name, cannot apply v2 API in policies...This PR is going to clear/group the function name, comments, and some error messages through two
chorecommits. Then, through tworefactorcommits, some adjustments were made to the process of creating and deleting endpoints, so that the API processing logic of both versions is almost the same. Finally, through a breakingrefactorcommit to unify the two versions of the policy applying processing.I think the impact of this final breaking commit is very small as the v2 API lacks the use under dockershim. Merging
HcnPolicyArgsintoPoliciesfield to unify the endpoint policy configuration in one place. We still keep the same as before under dockershim, but change as below when switching to containerd.{ "name":"cbr0", "type":"flannel", "delegate":{ + "apiVersion":2, "type":"win-bridge", "dns":{ "nameservers":[ "11.0.0.10" ], "search":[ "svc.cluster.local" ] }, "policies":[ { "name":"EndpointPolicy", "value":{ "Type":"OutBoundNAT", - "ExceptionList":[ - "192.168.0.0/16", - "11.0.0.0/8", - "10.137.196.0/23" - ] + "Settings":{ + "Exceptions":[ + "192.168.0.0/16", + "11.0.0.0/8", + "10.137.196.0/23" + ] + } } }, { "name":"EndpointPolicy", "value":{ - "Type":"ROUTE", - "DestinationPrefix":"11.0.0.0/8", - "NeedEncap":true + "Type":"SDNRoute", + "Settings":{ + "DestinationPrefix":"11.0.0.0/8", + "NeedEncap":true + } } }, { "name":"EndpointPolicy", "value":{ - "Type":"ROUTE", - "DestinationPrefix":"10.137.198.27/32", - "NeedEncap":true + "Type":"SDNRoute", + "Settings":{ + "DestinationPrefix":"10.137.198.27/32", + "NeedEncap":true + } } } ], "loopbackDSR": true } }