reset err in resolveServingLocation() when the req can be served by local apiserver

Author: richabanker

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
 		}
 

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)