cli: increase kubecmd retry limit (#2500)

Signed-off-by: Daniel Weiße <[email protected]>
edgelesssys · Oct 24, 2023 · d218f29 · d218f29
1 parent a1b4db4
commit d218f29
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cli/internal/kubecmd/kubecmd.go b/cli/internal/kubecmd/kubecmd.go
@@ -52,7 +52,7 @@ import (
 )
 
 const (
-	maxRetryAttempts = 5
+	maxRetryAttempts = 20
 )
 
 // ErrInProgress signals that an upgrade is in progress inside the cluster.
@@ -231,7 +231,7 @@ func (k *KubeCmd) ApplyJoinConfig(ctx context.Context, newAttestConfig config.At
 		}
 		retries++
 		k.log.Debugf("Getting join-config ConfigMap failed (attempt %d/%d): %s", retries, maxRetryAttempts, err)
-		return retries <= maxRetryAttempts
+		return retries < maxRetryAttempts
 	}
 
 	var joinConfig *corev1.ConfigMap
@@ -488,7 +488,7 @@ func retryAction(ctx context.Context, retryInterval time.Duration, maxRetries in
 	retrier := conretry.NewIntervalRetrier(&kubeDoer{action: action}, retryInterval, func(err error) bool {
 		ctr++
 		log.Debugf("Action failed (attempt %d/%d): %s", ctr, maxRetries, err)
-		return ctr <= maxRetries
+		return ctr < maxRetries
 	})
 	return retrier.Do(ctx)
 }

diff --git a/cli/internal/kubecmd/kubecmd_test.go b/cli/internal/kubecmd/kubecmd_test.go
@@ -484,7 +484,7 @@ func TestApplyJoinConfig(t *testing.T) {
 	// be updated here
 	repeatedErrors := func(err error) []error {
 		var errs []error
-		for i := 0; i < 20; i++ {
+		for i := 0; i < 30; i++ {
 			errs = append(errs, err)
 		}
 		return errs