update service reconciler

pluralsh · Jan 29, 2025 · 9bbc419 · 9bbc419
1 parent a13fbcd
commit 9bbc419
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/go/controller/internal/controller/servicedeployment_controller.go b/go/controller/internal/controller/servicedeployment_controller.go
@@ -137,13 +137,8 @@ func (r *ServiceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_
 	}
 
 	attr, result, err := r.genServiceAttributes(ctx, service, repository.Status.ID)
-	if result != nil {
-		utils.MarkCondition(service.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionFalse, v1alpha1.SynchronizedConditionReasonError, defaultErrMessage(err, ""))
-		return *result, nil // If the result is set, then error is ignored to requeue.
-	}
-	if err != nil {
-		utils.MarkCondition(service.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionFalse, v1alpha1.SynchronizedConditionReasonError, err.Error())
-		return ctrl.Result{}, err
+	if result != nil || err != nil {
+		return handleRequeue(result, err, service.SetCondition)
 	}
 
 	existingService, err := r.ConsoleClient.GetService(*cluster.Status.ID, service.ConsoleName())