github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-23 18:37:40 +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
parent 1cb7d0f9c0
commit f0517062fc
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
multus/multus.go
View File

@@ -371,15 +371,15 @@ func cmdAdd(args *skel.CmdArgs, exec invoke.Exec, kubeClient k8s.KubeClient) (cn
return nil, logging.Errorf("Multus: error getting k8s args: %v", err) return nil, logging.Errorf("Multus: error getting k8s args: %v", err)
} }
wait.ExponentialBackoff(defaultReadinessBackoff, func() (bool, error) { if n.ReadinessIndicatorFile != "" {
_, err := os.Stat(n.ReadinessIndicatorFile) err := wait.ExponentialBackoff(defaultReadinessBackoff, func() (bool, error) {
switch { _, err := os.Stat(n.ReadinessIndicatorFile)
case err == nil: return err == nil, nil
return true, nil })
default: if err != nil {
return false, 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)