github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-08-22 18:18:00 +00:00
Code Issues Projects Releases Wiki Activity

Setting the MAC in CNI_ARGS shouldn't override the already existing CNI_ARGS

Browse Source
This commit is contained in:
Alona Kaplan 2018-11-12 17:29:26 +02:00 committed by dougbtv
parent d773dcfaad
commit fd5ac6801c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
multus/multus.go
View File

@ -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)