From f6d47eb908aa85380d0d0b75d05dd6f131ae8b7a Mon Sep 17 00:00:00 2001 From: Alejandro Ruiz <4057165+aruiz14@users.noreply.github.com> Date: Thu, 20 Feb 2025 18:03:03 +0100 Subject: [PATCH] Fix "Unable to cancel request for *client.addQuery" warnings (#512) --- pkg/client/factory.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkg/client/factory.go b/pkg/client/factory.go index eed5c40b..67e16dc7 100644 --- a/pkg/client/factory.go +++ b/pkg/client/factory.go @@ -10,6 +10,7 @@ import ( "github.com/rancher/apiserver/pkg/types" "github.com/rancher/steve/pkg/attributes" + utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/client-go/dynamic" "k8s.io/client-go/kubernetes" @@ -33,6 +34,8 @@ type addQuery struct { next http.RoundTripper } +var _ utilnet.RoundTripperWrapper = (*addQuery)(nil) + func (a *addQuery) RoundTrip(req *http.Request) (*http.Response, error) { q := req.URL.Query() for k, v := range a.values { @@ -43,6 +46,10 @@ func (a *addQuery) RoundTrip(req *http.Request) (*http.Response, error) { return a.next.RoundTrip(req) } +func (a *addQuery) WrappedRoundTripper() http.RoundTripper { + return a.next +} + func NewFactory(cfg *rest.Config, impersonate bool) (*Factory, error) { clientCfg := rest.CopyConfig(cfg) updateConfigFromEnvironment(clientCfg)