github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #107606 from xens/feat/propagate_req_context_into_proxyreq

Browse Source 
feat: propagate req context into proxyReq
This commit is contained in:
Kubernetes Prow Robot 2022-01-18 12:02:22 -08:00 committed by GitHub
commit 40055e45a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper.go
View File

@ -173,12 +173,14 @@ func (s *SpdyRoundTripper) dial(req *http.Request) (net.Conn, error) {
Host: targetHost, Host: targetHost,
} }
proxyReq = *proxyReq.WithContext(req.Context())
if pa := s.proxyAuth(proxyURL); pa != "" { if pa := s.proxyAuth(proxyURL); pa != "" {
proxyReq.Header = http.Header{} proxyReq.Header = http.Header{}
proxyReq.Header.Set("Proxy-Authorization", pa) proxyReq.Header.Set("Proxy-Authorization", pa)
} }
proxyDialConn, err := s.dialWithoutProxy(req.Context(), proxyURL) proxyDialConn, err := s.dialWithoutProxy(proxyReq.Context(), proxyURL)
if err != nil { if err != nil {
return nil, err return nil, err
} }