From ed3f96ce28146fcc53e2df9b55cd58e95e4b8748 Mon Sep 17 00:00:00 2001 From: Sarah Zinger Date: Mon, 3 Mar 2025 15:52:47 -0500 Subject: [PATCH] Fix misleading log line (#101532) --- pkg/registry/apis/query/query.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkg/registry/apis/query/query.go b/pkg/registry/apis/query/query.go index f3675514a25..fb10e8469f6 100644 --- a/pkg/registry/apis/query/query.go +++ b/pkg/registry/apis/query/query.go @@ -160,7 +160,19 @@ func (r *queryREST) Connect(connectCtx context.Context, name string, _ runtime.O // Actually run the query rsp, err := b.execute(ctx, req) if err != nil { - b.log.Error("hit unexpected error while executing query, this will show as an unhandled k8s status error", "err", err) + // log unexpected errors + var k8sErr *errorsK8s.StatusError + if errors.As(err, &k8sErr) { + // we do not need to log 4xx errors as they are expected + if k8sErr.ErrStatus.Code >= 500 { + b.log.Error("hit unexpected k8s error while executing query", "err", err, "status", k8sErr.Status()) + } + b.log.Debug("sending a known k8s error to the client", "err", err, "status", k8sErr.Status()) + } else { + b.log.Error("hit unexpected error while executing query, this will show as an unhandled k8s status error", "err", err) + } + + // return the error to the client, will send all non k8s errors as a k8 unexpected error responder.Error(err) return }