From cdd5ccd9269f205b88da53ed8dc593dc811f6471 Mon Sep 17 00:00:00 2001 From: Md Soharab Ansari Date: Fri, 8 Mar 2024 11:17:10 +0530 Subject: [PATCH] Resolve merge conflict Signed-off-by: Md Soharab Ansari --- pkg/webhook/pod/webhook.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/webhook/pod/webhook.go b/pkg/webhook/pod/webhook.go index 1f82667b3..ebad66dd4 100644 --- a/pkg/webhook/pod/webhook.go +++ b/pkg/webhook/pod/webhook.go @@ -154,7 +154,7 @@ func (wh *WebhookServer) Handle(ctx context.Context, req admission.Request) admi return admission.PatchResponseFromRaw(req.Object.Raw, marshaled) } else if req.Kind.Kind == "ServiceExport" { serviceexport := &v1beta1.ServiceExport{} - err := wh.decoder.Decode(req, serviceexport) + err := wh.Decoder.Decode(req, serviceexport) if err != nil { return admission.Errored(http.StatusBadRequest, err) }