Skip to content

Commit

Permalink
Multus should exit zero on DEL when cache file is missing and pod can…
Browse files Browse the repository at this point in the history
…not be found.

Otherwise, this can cause a pod to not be fully deleted, its sandbox may remain as the DEL continues to be retried due to exiting non-zero every time.

See: https://bugzilla.redhat.com/show_bug.cgi?id=1900835
  • Loading branch information
dougbtv authored and s1061123 committed Nov 25, 2020
1 parent 6a23d65 commit cfa0d64
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion multus/multus.go
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,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)
Expand Down

0 comments on commit cfa0d64

Please sign in to comment.