controller: ignore NotFound API error on delete

Signed-off-by: Hidde Beydals <hidde@hhh.computer>
fluxcd · Nov 3, 2023 · c12b8c8 · c12b8c8
1 parent 7c5c23a
commit c12b8c8
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/internal/controller/helmrelease_controller.go b/internal/controller/helmrelease_controller.go
@@ -166,11 +166,10 @@ func (r *HelmReleaseReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		}
 
 		if err := patchHelper.Patch(ctx, obj, patchOpts...); err != nil {
-			if retErr != nil {
-				retErr = apierrutil.NewAggregate([]error{retErr, err})
-			} else {
-				retErr = err
+			if !obj.DeletionTimestamp.IsZero() {
+				err = apierrutil.FilterOut(err, func(e error) bool { return apierrors.IsNotFound(e) })
 			}
+			retErr = apierrutil.Reduce(apierrutil.NewAggregate([]error{retErr, err}))
 		}
 
 		// Always record suspend, readiness and duration metrics.