Do more attempts (almost 6 mins total)

Signed-off-by: Sergei Lukianov <[email protected]>
githedgehog · Dec 31, 2024 · 8c7b324 · 8c7b324
1 parent 135b17c
commit 8c7b324
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/pkg/fab/comp/kube.go b/pkg/fab/comp/kube.go
@@ -137,7 +137,7 @@ func EnforceKubeInstall(ctx context.Context, kube client.Client, cfg fabapi.Fabr
 			var err error
 
 			backoff := wait.Backoff{
-				Steps:    10,
+				Steps:    17,
 				Duration: 500 * time.Millisecond,
 				Factor:   1.5,
 				Jitter:   0.1,
@@ -149,7 +149,7 @@ func EnforceKubeInstall(ctx context.Context, kube client.Client, cfg fabapi.Fabr
 
 			attempt := 0
 			if err := retry.OnError(backoff, func(error) bool {
-				return true
+				return !apierrors.IsConflict(err)
 			}, func() error {
 				if attempt > 0 {
 					slog.Debug("Retrying create or update", "kind", kind, "name", name, "attempt", attempt)

diff --git a/pkg/fab/recipe/control_install.go b/pkg/fab/recipe/control_install.go
@@ -573,7 +573,7 @@ func (c *ControlInstall) installWiring(ctx context.Context, kube client.Client)
 			attempt := 0
 
 			if err := retry.OnError(wait.Backoff{
-				Steps:    10,
+				Steps:    17,
 				Duration: 500 * time.Millisecond,
 				Factor:   1.5,
 				Jitter:   0.1,

diff --git a/pkg/fab/recipe/control_upgrade.go b/pkg/fab/recipe/control_upgrade.go
@@ -28,7 +28,6 @@ import (
 	"go.githedgehog.com/fabricator/pkg/fab/comp/k9s"
 	"go.githedgehog.com/fabricator/pkg/fab/comp/zot"
 	coreapi "k8s.io/api/core/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/util/retry"
@@ -78,14 +77,14 @@ func (c *ControlUpgrade) Run(ctx context.Context) error {
 	}
 
 	backoff := wait.Backoff{
-		Steps:    10,
+		Steps:    17,
 		Duration: 500 * time.Millisecond,
 		Factor:   1.5,
 		Jitter:   0.1,
 	}
 
-	if err := retry.OnError(backoff, func(err error) bool {
-		return apierrors.ReasonForError(err) != metav1.StatusReasonUnknown
+	if err := retry.OnError(backoff, func(error) bool {
+		return true
 	}, func() error {
 		f, control, err := fab.GetFabAndControls(ctx, kube, false)
 		if err != nil {
@@ -187,7 +186,7 @@ func (c *ControlUpgrade) uploadAirgap(ctx context.Context, username, password st
 	}
 
 	backoff := wait.Backoff{
-		Steps:    10,
+		Steps:    17,
 		Duration: 500 * time.Millisecond,
 		Factor:   1.5,
 		Jitter:   0.1,