From fd5ac6801c83fab69a5521745f8d0a2c406f1161 Mon Sep 17 00:00:00 2001 From: Alona Kaplan Date: Mon, 12 Nov 2018 17:29:26 +0200 Subject: [PATCH] Setting the MAC in CNI_ARGS shouldn't override the already existing CNI_ARGS --- multus/multus.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multus/multus.go b/multus/multus.go index 524b174fa..958e769fd 100644 --- a/multus/multus.go +++ b/multus/multus.go @@ -177,7 +177,7 @@ func delegateAdd(exec invoke.Exec, ifName string, delegate *types.DelegateNetCon return nil, logging.Errorf("failed to parse mac address %q", delegate.MacRequest) } - if os.Setenv("CNI_ARGS", fmt.Sprintf("IgnoreUnknown=true;MAC=%s", delegate.MacRequest)) != nil { + if os.Setenv("CNI_ARGS",fmt.Sprintf("%s;IgnoreUnknown=true;MAC=%s", os.Getenv("CNI_ARGS"), delegate.MacRequest)) != nil { return nil, logging.Errorf("cannot set %q mac to %q: %v", delegate.Conf.Type, delegate.MacRequest, err) } logging.Debugf("Set MAC address %q to %q", delegate.MacRequest, ifName)