dev: propagate recocnile error

Altinity · Oct 10, 2024 · 397ba75 · 397ba75
1 parent ab1f5fb
commit 397ba75
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/pkg/controller/chi/worker-chi-reconciler.go b/pkg/controller/chi/worker-chi-reconciler.go
@@ -576,18 +576,24 @@ func (w *worker) reconcileHost(ctx context.Context, host *api.Host) error {
 	startTime := time.Now()
 
 	if host.IsFirst() {
-		w.reconcileCRServicePreliminary(ctx, host.GetCR())
+		_ = w.reconcileCRServicePreliminary(ctx, host.GetCR())
 		defer w.reconcileCRServiceFinal(ctx, host.GetCR())
 	}
 
 	// Create artifacts
 	w.stsReconciler.PrepareHostStatefulSetWithStatus(ctx, host, false)
 
-	w.reconcileHostPrepare(ctx, host)
-	w.reconcileHostMain(ctx, host)
+	if err := w.reconcileHostPrepare(ctx, host); err != nil {
+		return err
+	}
+	if err := w.reconcileHostMain(ctx, host); err != nil {
+		return err
+	}
 	// Host is now added and functional
 	host.GetReconcileAttributes().UnsetAdd()
-	w.reconcileHostBootstrap(ctx, host)
+	if err := w.reconcileHostBootstrap(ctx, host); err != nil {
+		return err
+	}
 
 	now := time.Now()
 	hostsCompleted := 0

diff --git a/pkg/controller/chk/worker-chk-reconciler.go b/pkg/controller/chk/worker-chk-reconciler.go
@@ -511,18 +511,24 @@ func (w *worker) reconcileHost(ctx context.Context, host *api.Host) error {
 	defer w.a.V(2).M(host).E().P()
 
 	if host.IsFirst() {
-		w.reconcileCRServicePreliminary(ctx, host.GetCR())
+		_ = w.reconcileCRServicePreliminary(ctx, host.GetCR())
 		defer w.reconcileCRServiceFinal(ctx, host.GetCR())
 	}
 
 	// Create artifacts
 	w.stsReconciler.PrepareHostStatefulSetWithStatus(ctx, host, false)
 
-	w.reconcileHostPrepare(ctx, host)
-	w.reconcileHostMain(ctx, host)
+	if err := w.reconcileHostPrepare(ctx, host); err != nil {
+		return err
+	}
+	if err := w.reconcileHostMain(ctx, host); err != nil {
+		return err
+	}
 	// Host is now added and functional
 	host.GetReconcileAttributes().UnsetAdd()
-	w.reconcileHostBootstrap(ctx, host)
+	if err := w.reconcileHostBootstrap(ctx, host); err != nil {
+		return err
+	}
 
 	now := time.Now()
 	hostsCompleted := 0