From ed48ed0122c7289f458a6bc3ac616319d5c17e91 Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Mon, 27 Jan 2020 19:52:47 -0800 Subject: [PATCH] various context related cleanups to rest.Request * Move all usage of r.ctx to the beginning of Do, DoRaw, Stream, Watch * Move tryThrottle from Do and DoRaw into request() * Make request() and tryThrottle take a context * In request(), remove the timeout context setting out of the loop These changes should be entirely behavior preserving. --- staging/src/k8s.io/client-go/rest/request.go | 1 + 1 file changed, 1 insertion(+) diff --git a/staging/src/k8s.io/client-go/rest/request.go b/staging/src/k8s.io/client-go/rest/request.go index 948d3d9c758..ebc811e42b2 100644 --- a/staging/src/k8s.io/client-go/rest/request.go +++ b/staging/src/k8s.io/client-go/rest/request.go @@ -786,6 +786,7 @@ func (r *Request) request(ctx context.Context, fn func(*http.Request, *http.Resp maxRetries := 10 retries := 0 for { + url := r.URL().String() req, err := http.NewRequest(r.verb, url, r.body) if err != nil {