Skip to content

Commit

Permalink
Resolve merge conflict
Browse files Browse the repository at this point in the history
Signed-off-by: Md Soharab Ansari <[email protected]>
  • Loading branch information
soharab-ic committed Mar 8, 2024
1 parent 7a56e2d commit cdd5ccd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/webhook/pod/webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down

0 comments on commit cdd5ccd

Please sign in to comment.