Treat error decoding a mutating webhook patch as error calling the webhook

dims · Matthew Wong · dims · commit cf82fd7e9cea · 2025-05-06T09:35:27.000-04:00
Co-Authored-By: Matthew Wong &lt;mattwon@amazon.com&gt;
Signed-off-by: Davanum Srinivas &lt;davanum@gmail.com&gt;
diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/mutating/dispatcher.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/mutating/dispatcher.go
@@ -335,7 +335,7 @@ func (a *mutatingDispatcher) callAttrMutatingHook(ctx context.Context, h *admiss
 	}
 	patchObj, err := jsonpatch.DecodePatch(result.Patch)
 	if err != nil {
-		return false, apierrors.NewInternalError(err)
+		return false, &webhookutil.ErrCallingWebhook{WebhookName: h.Name, Reason: fmt.Errorf("received undecodable patch in webhook response: %w", err), Status: apierrors.NewServiceUnavailable("error decoding patch in webhook response")}
 	}
 
 	if len(patchObj) == 0 {

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ func (a mutatingDispatcher) callAttrMutatingHook(ctx context.Context, h admiss`
`335`	`335`	`}`
`336`	`336`	`patchObj, err := jsonpatch.DecodePatch(result.Patch)`
`337`	`337`	`if err != nil {`
`338`		`- return false, apierrors.NewInternalError(err)`
	`338`	`+ return false, &webhookutil.ErrCallingWebhook{WebhookName: h.Name, Reason: fmt.Errorf("received undecodable patch in webhook response: %w", err), Status: apierrors.NewServiceUnavailable("error decoding patch in webhook response")}`
`339`	`339`	`}`
`340`	`340`
`341`	`341`	`if len(patchObj) == 0 {`