refator/fix: backoff v5 usage

Signed-off-by: Sandor Szücs <sandor.szuecs@zalando.de>

Author: szuecs

net/redisclient.go

@@ -352,13 +352,14 @@ func (r *RedisRingClient) startUpdater(ctx context.Context) {
 
 func (r *RedisRingClient) RingAvailable() bool {
 	var err error
-	err = backoff.Retry(func() error {
+
+	_, err = backoff.Retry(context.TODO(), func() (string, error) {
 		_, err = r.ring.Ping(context.Background()).Result()
 		if err != nil {
 			r.log.Infof("Failed to ping redis, retry with backoff: %v", err)
 		}
-		return err
-	}, backoff.WithMaxRetries(backoff.NewExponentialBackOff(), 7))
+		return "", err
+	}, backoff.WithBackOff(backoff.NewExponentialBackOff()), backoff.WithMaxTries(7))
 
 	return err == nil
 }

swarm/kubernetes.go

@@ -1,6 +1,7 @@
 package swarm
 
 import (
+	"context"
 	"crypto/tls"
 	"crypto/x509"
 	"errors"
@@ -52,7 +53,6 @@ type ClientKubernetes struct {
 	httpClient *http.Client
 	apiURL     string
 	token      string
-	retry      backoff.BackOff
 	quit       chan struct{}
 }
 
@@ -69,13 +69,14 @@ func (c *ClientKubernetes) Get(s string) (*http.Response, error) {
 		return nil, err
 	}
 
-	err = backoff.Retry(func() error {
+	// backoff.WithMaxRetries(backoff.NewConstantBackOff(5*time.Second), maxRetries),
+	_, err = backoff.Retry(context.TODO(), func() (string, error) {
 		rsp, err = c.httpClient.Do(req)
 		if err != nil {
 			log.Infof("SWARM: request to %s failed: %v, retrying..", s, err)
 		}
-		return err
-	}, c.retry)
+		return "", err
+	}, backoff.WithBackOff(backoff.NewConstantBackOff(5*time.Second)), backoff.WithMaxTries(maxRetries))
 
 	if err != nil {
 		log.Errorf("SWARM: Give up now, request to %s failed: %v", s, err)
@@ -113,7 +114,6 @@ func NewClientKubernetes(kubernetesInCluster bool, kubernetesURL string) (*Clien
 		httpClient: httpClient,
 		apiURL:     apiURL,
 		token:      token,
-		retry:      backoff.WithMaxRetries(backoff.NewConstantBackOff(5*time.Second), maxRetries),
 		quit:       quit,
 	}, nil
 }