diff --git a/pkg/multus/multus.go b/pkg/multus/multus.go index fc01835aa..740108d2a 100644 --- a/pkg/multus/multus.go +++ b/pkg/multus/multus.go @@ -44,6 +44,11 @@ import ( "k8s.io/apimachinery/pkg/util/wait" ) +const ( + shortPollDuration = 250 * time.Millisecond + shortPollTimeout = 2500 * time.Millisecond +) + var ( version = "master@git" commit = "unknown commit" @@ -551,9 +556,7 @@ func CmdAdd(args *skel.CmdArgs, exec invoke.Exec, kubeClient *k8s.ClientInfo) (c var waitErr error // in case of a retriable error, retry 10 times with 0.25 sec interval if isCriticalRequestRetriable(err) { - pollDuration := 250 * time.Millisecond - pollTimeout := 2500 * time.Millisecond - waitErr = wait.PollImmediate(pollDuration, pollTimeout, func() (bool, error) { + waitErr = wait.PollImmediate(shortPollDuration, shortPollTimeout, func() (bool, error) { pod, err = kubeClient.GetPod(string(k8sArgs.K8S_POD_NAMESPACE), string(k8sArgs.K8S_POD_NAME)) return pod != nil, err }) @@ -778,9 +781,7 @@ func CmdDel(args *skel.CmdArgs, exec invoke.Exec, kubeClient *k8s.ClientInfo) er var waitErr error // in case of a retriable error, retry 10 times with 0.25 sec interval if isCriticalRequestRetriable(err) { - pollDuration := 250 * time.Millisecond - pollTimeout := 2500 * time.Millisecond - waitErr = wait.PollImmediate(pollDuration, pollTimeout, func() (bool, error) { + waitErr = wait.PollImmediate(shortPollDuration, shortPollTimeout, func() (bool, error) { pod, err = kubeClient.GetPod(string(k8sArgs.K8S_POD_NAMESPACE), string(k8sArgs.K8S_POD_NAME)) return pod != nil, err })