Fix veth device name conflict when multi network enabled #115
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
chenchun
reviewed
Dec 21, 2020
| @@ -171,8 +176,8 @@ func DeleteVeth(netnsPath, ifName string) error { | |||
| } | |||
|
|
|||
| // DeleteHostVeth deletes veth device in the host network namespace | |||
| func DeleteHostVeth(containerId string) error { | |||
| hostIfName := HostVethName(containerId, "") | |||
| func DeleteHostVeth(containerId, suffix string) error { | |||
There was a problem hiding this comment.
这个修改好像没用上？我看没有地方有传过非空的suffix
|
Thanks for fixing this @horizen |
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.
follow cni plugin dependency veth device
when multi network enable for example flannel and k8s-vlan, the veth device name may conflict。
this patch use different suffix for galaxy-k8s-vlan and galaxy-underlay-veth plugin but keep galaxy-veth device name not changed for backward compatibility.