From 6e66a359822a988f9acd7062c3731559535abcd5 Mon Sep 17 00:00:00 2001 From: Richa Banker Date: Fri, 27 Sep 2024 16:54:08 -0700 Subject: [PATCH] reset err in resolveServingLocation() when the req can be served by local apiserver --- .../k8s.io/apiserver/pkg/util/peerproxy/peerproxy_handler.go | 3 ++- .../apiserver/pkg/util/peerproxy/peerproxy_handler_test.go | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/util/peerproxy/peerproxy_handler.go b/staging/src/k8s.io/apiserver/pkg/util/peerproxy/peerproxy_handler.go index 8e236a7505c..c1a77791d7f 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/peerproxy/peerproxy_handler.go +++ b/staging/src/k8s.io/apiserver/pkg/util/peerproxy/peerproxy_handler.go @@ -199,7 +199,8 @@ func (h *peerProxyHandler) resolveServingLocation(apiservers *sync.Map) (bool, [ apiserverKey := key.(string) if apiserverKey == h.serverId { locallyServiceable = true - // stop iteration + // stop iteration and reset any errors encountered so far. + respErr = nil return false } diff --git a/staging/src/k8s.io/apiserver/pkg/util/peerproxy/peerproxy_handler_test.go b/staging/src/k8s.io/apiserver/pkg/util/peerproxy/peerproxy_handler_test.go index f9c9aec9e26..4fb45f30243 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/peerproxy/peerproxy_handler_test.go +++ b/staging/src/k8s.io/apiserver/pkg/util/peerproxy/peerproxy_handler_test.go @@ -285,7 +285,10 @@ func TestPeerProxy(t *testing.T) { } req.Header.Set(PeerProxiedHeader, tt.peerproxiedHeader) - resp, _ := requestGetter(req) + resp, err := requestGetter(req) + if err != nil { + t.Fatalf("unexpected error trying to get the request: %v", err) + } // compare response assert.Equal(t, tt.expectedStatus, resp.StatusCode)