github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-26 20:13:22 +00:00
Code Issues Projects Releases Wiki Activity

[bugfix] Fixes unnecessary wait when readinessindicatorfile is not present

Browse Source
This commit is contained in:
dougbtv
2020-02-10 13:44:12 -05:00
committed by Tomofumi Hayashi
parent 8334b73296
commit 4fdaf3f427
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
multus/multus.go
View File

@@ -453,15 +453,15 @@ func cmdAdd(args *skel.CmdArgs, exec invoke.Exec, kubeClient *k8s.ClientInfo) (c
return nil, cmdErr(nil, "error getting k8s args: %v", err) return nil, cmdErr(nil, "error getting k8s args: %v", err)
} }
wait.ExponentialBackoff(defaultReadinessBackoff, func() (bool, error) { if n.ReadinessIndicatorFile != "" {
err := wait.ExponentialBackoff(defaultReadinessBackoff, func() (bool, error) {
_, err := os.Stat(n.ReadinessIndicatorFile) _, err := os.Stat(n.ReadinessIndicatorFile)
switch { return err == nil, nil
case err == nil:
return true, nil
default:
return false, nil
}
}) })
if err != nil {
return nil, cmdErr(k8sArgs, "ExponentialBackoff error waiting for ReadinessIndicatorFile: %v", err)
}
}
if n.ClusterNetwork != "" { if n.ClusterNetwork != "" {
err = k8s.GetDefaultNetworks(k8sArgs, n, kubeClient) err = k8s.GetDefaultNetworks(k8sArgs, n, kubeClient)