From 7f389e7e7c20ae290d25f56335d2aeda4be271b5 Mon Sep 17 00:00:00 2001 From: Michael Cambria Date: Thu, 1 Nov 2018 12:55:39 -0400 Subject: [PATCH] Make conflistDel() behave like conflistAdd() conflistAdd() finds binaries differently than conflistDel(). Make the two call find binaries the same way. Fixes #179 Signed-off-by: Michael Cambria --- multus/multus.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/multus/multus.go b/multus/multus.go index f461674b..cdcdb69b 100644 --- a/multus/multus.go +++ b/multus/multus.go @@ -139,11 +139,12 @@ func conflistAdd(rt *libcni.RuntimeConf, rawnetconflist []byte, binDir string) ( return result, nil } -func conflistDel(rt *libcni.RuntimeConf, rawnetconflist []byte, binDir string) error { +func conflistDel(rt *libcni.RuntimeConf, rawnetconflist []byte, binDir string, exec invoke.Exec) error { logging.Debugf("conflistDel: %v, %s, %s", rt, string(rawnetconflist), binDir) // In part, adapted from K8s pkg/kubelet/dockershim/network/cni/cni.go - binDirs := []string{binDir} - cniNet := libcni.CNIConfig{Path: binDirs} + binDirs := filepath.SplitList(os.Getenv("CNI_PATH")) + binDirs = append(binDirs, binDir) + cniNet := libcni.NewCNIConfig(binDirs, exec) confList, err := libcni.ConfListFromBytes(rawnetconflist) if err != nil { @@ -192,7 +193,7 @@ func delegateDel(exec invoke.Exec, ifName string, delegateConf *types.DelegateNe } if delegateConf.ConfListPlugin != false { - err := conflistDel(rt, delegateConf.Bytes, binDir) + err := conflistDel(rt, delegateConf.Bytes, binDir, exec) if err != nil { return logging.Errorf("Multus: error in invoke Conflist Del - %q: %v", delegateConf.ConfList.Name, err) }