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

Merge pull request #84 from dougbtv/backport-exit-zero-on-del-4.6

Browse Source 
Bug 1905230: Multus should exit zero on DEL when cache file is missing [backport 4.6]
This commit is contained in:
OpenShift Merge Robot 2020-12-12 09:52:19 -05:00 committed by GitHub
commit 6fb56fdcbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
multus/multus.go
View File

@ -758,7 +758,10 @@ func cmdDel(args *skel.CmdArgs, exec invoke.Exec, kubeClient *k8s.ClientInfo) er
logging.Errorf("Multus: failed to get delegates: %v, but continue to delete clusterNetwork", err)
}
} else {
return cmdErr(k8sArgs, "error reading the delegates: %v", err)
// The options to continue with a delete have been exhausted (cachefile + API query didn't work)
// We cannot exit with an error as this may cause a sandbox to never get deleted.
logging.Errorf("Multus: failed to get the cached delegates file: %v, cannot properly delete", err)
return nil
}
} else {
defer os.Remove(path)