Merge pull request kubernetes-sigs#10787 from troy0820/troy0820/patch…

…-ignore-option 🐛Check errors for IsNotFound after patching spec and status
cahillsf · Jul 15, 2024 · 6f06154 · 6f06154
2 parents afe7338 + c8ae301
commit 6f06154
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/util/patch/patch.go b/util/patch/patch.go
@@ -146,8 +146,11 @@ func (h *Helper) Patch(ctx context.Context, obj client.Object, opts ...Option) e
 	if err := h.patch(ctx, obj); err != nil {
 		errs = append(errs, err)
 	}
+
 	if err := h.patchStatus(ctx, obj); err != nil {
-		errs = append(errs, err)
+		if !(apierrors.IsNotFound(err) && !obj.GetDeletionTimestamp().IsZero() && len(obj.GetFinalizers()) == 0) {
+			errs = append(errs, err)
+		}
 	}
 
 	if len(errs) > 0 {