From cb47afa6334875b16f49aba924be6b9b9b709598 Mon Sep 17 00:00:00 2001 From: dougbtv Date: Fri, 27 Mar 2020 08:19:31 -0400 Subject: [PATCH] Adds readinessindicatorfile check on CNI DEL --- multus/multus.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/multus/multus.go b/multus/multus.go index 02c0b2e53..30674f3d0 100644 --- a/multus/multus.go +++ b/multus/multus.go @@ -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 {