github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-01 17:09:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #56 from openshift-cherrypick-robot/cherry-pick-54-to-release-4.4

Browse Source 
Bug 1823490: [release-4.4] Adds readinessindicatorfile check on CNI DEL
This commit is contained in:
OpenShift Merge Robot
2020-04-16 06:51:21 -07:00
committed by GitHub
parent 384bc19c84 916690bae4
commit a30bc622b0
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
multus/multus.go
View File

@@ -528,6 +528,16 @@ func cmdDel(args *skel.CmdArgs, exec invoke.Exec, kubeClient k8s.KubeClient) err
return cmdErr(nil, "error getting k8s args: %v", err)
}
if in.ReadinessIndicatorFile != "" {
err := wait.PollImmediate(pollDuration, pollTimeout, func() (bool, error) {
_, err := os.Stat(in.ReadinessIndicatorFile)
return err == nil, nil
})
if err != nil {
return cmdErr(k8sArgs, "PollImmediate error waiting for ReadinessIndicatorFile (on del): %v", err)
}
}
// Read the cache to get delegates json for the pod
netconfBytes, path, err := consumeScratchNetConf(args.ContainerID, in.CNIDir)
if err != nil {