Merge pull request #10787 from troy0820/troy0820/patch-ignore-option

k8s-ci-robot · web-flow · commit 6f06154b411c · 2024-07-15T07:01:10.000-07:00
🐛Check errors for IsNotFound after patching spec and status
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 {

Original file line number	Diff line number	Diff line change
`@@ -146,8 +146,11 @@ func (h *Helper) Patch(ctx context.Context, obj client.Object, opts ...Option) e`
`146`	`146`	`if err := h.patch(ctx, obj); err != nil {`
`147`	`147`	`errs = append(errs, err)`
`148`	`148`	`}`
	`149`	`+`
`149`	`150`	`if err := h.patchStatus(ctx, obj); err != nil {`
`150`		`- errs = append(errs, err)`
	`151`	`+ if !(apierrors.IsNotFound(err) && !obj.GetDeletionTimestamp().IsZero() && len(obj.GetFinalizers()) == 0) {`
	`152`	`+ errs = append(errs, err)`
	`153`	`+ }`
`151`	`154`	`}`
`152`	`155`
`153`	`156`	`if len(errs) > 0 {`