-
Notifications
You must be signed in to change notification settings - Fork 577
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Make conflistDel() behave like conflistAdd() #182
Conversation
Pull Request Test Coverage Report for Build 468
💛 - Coveralls |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me. I add a minor comment.
multus/multus.go
Outdated
@@ -140,11 +140,13 @@ func conflistAdd(rt *libcni.RuntimeConf, rawnetconflist []byte, binDir string, e | |||
return result, nil | |||
} | |||
|
|||
func conflistDel(rt *libcni.RuntimeConf, rawnetconflist []byte, binDir string) error { | |||
//func conflistDel(rt *libcni.RuntimeConf, rawnetconflist []byte, binDir string) error { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How about to remove it?
conflistAdd() finds binaries differently than conflistDel(). Make the two call find binaries the same way. Fixes k8snetworkplumbingwg#179 Signed-off-by: Michael Cambria <mcambria@redhat.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me, but it seems to be conflicts. Could you rebase to head?
merged, thanks again! |
conflistAdd() finds binaries differently than conflistDel().
Make the two call find binaries the same way.
Fixes #179
Signed-off-by: Michael Cambria mcambria@redhat.com