github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-14 21:47:25 +00:00
Code Issues Projects Releases Wiki Activity

Check ConfList in delete network by cache

Browse Source 
This change adds ConfList check in get delegates from cache,
to delete network gracefully.
This commit is contained in:
Tomofumi Hayashi
2019-03-29 21:31:49 +09:00
committed by Tomofumi Hayashi
parent 69ac1a5935
commit f11c851d97
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
multus/multus.go
View File

@@ -479,6 +479,12 @@ func cmdDel(args *skel.CmdArgs, exec invoke.Exec, kubeClient k8s.KubeClient) err
if err := json.Unmarshal(netconfBytes, &in.Delegates); err != nil { if err := json.Unmarshal(netconfBytes, &in.Delegates); err != nil {
return logging.Errorf("Multus: failed to load netconf: %v", err) return logging.Errorf("Multus: failed to load netconf: %v", err)
} }
// check plugins field and enable ConfListPlugin if there is
for _, v := range in.Delegates {
if len(v.ConfList.Plugins) != 0 {
v.ConfListPlugin = true
}
}
// First delegate is always the master plugin // First delegate is always the master plugin
in.Delegates[0].MasterPlugin = true in.Delegates[0].MasterPlugin = true
} }