Restores return early Reconcile loop

Signed-off-by: Brett Tofel <[email protected]>

Author: bentito

internal/controllers/clusterextension_controller.go

@@ -119,14 +119,16 @@ func (r *ClusterExtensionReconciler) Reconcile(ctx context.Context, req ctrl.Req
 	reconciledExt := existingExt.DeepCopy()
 	res, reconcileErr := r.reconcile(ctx, reconciledExt)
 
+	var updateErrors []error
+
 	// Do checks before any Update()s, as Update() may modify the resource structure!
 	updateStatus := !equality.Semantic.DeepEqual(existingExt.Status, reconciledExt.Status)
 	updateFinalizers := !equality.Semantic.DeepEqual(existingExt.Finalizers, reconciledExt.Finalizers)
 	unexpectedFieldsChanged := checkForUnexpectedFieldChange(*existingExt, *reconciledExt)
 
 	if updateStatus {
 		if updateErr := r.Client.Status().Update(ctx, reconciledExt); updateErr != nil {
-			return res, utilerrors.NewAggregate([]error{reconcileErr, updateErr})
+			updateErrors = append(updateErrors, updateErr)
 		}
 	}
 
@@ -136,11 +138,15 @@ func (r *ClusterExtensionReconciler) Reconcile(ctx context.Context, req ctrl.Req
 
 	if updateFinalizers {
 		if updateErr := r.Client.Update(ctx, reconciledExt); updateErr != nil {
-			return res, utilerrors.NewAggregate([]error{reconcileErr, updateErr})
+			updateErrors = append(updateErrors, updateErr)
 		}
 	}
 
-	return res, utilerrors.NewAggregate([]error{reconcileErr, nil})
+	if reconcileErr != nil {
+		updateErrors = append(updateErrors, reconcileErr)
+	}
+
+	return res, utilerrors.NewAggregate(updateErrors)
 }
 
 // ensureAllConditionsWithReason checks that all defined condition types exist in the given ClusterExtension,