From cbc2688be4e39f179d408e6fa3f737ce564416fe Mon Sep 17 00:00:00 2001 From: Alexander Kanevskiy Date: Mon, 23 Oct 2017 16:23:55 +0300 Subject: [PATCH] Use CIDR-aware proxy resolver for SPDY RoundTripper Fixes: #54407 --- .../apimachinery/pkg/util/httpstream/spdy/roundtripper.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper.go b/staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper.go index 12bef075dab..d2d3ad8cb01 100644 --- a/staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper.go @@ -110,7 +110,7 @@ func (s *SpdyRoundTripper) Dial(req *http.Request) (net.Conn, error) { func (s *SpdyRoundTripper) dial(req *http.Request) (net.Conn, error) { proxier := s.proxier if proxier == nil { - proxier = http.ProxyFromEnvironment + proxier = utilnet.NewProxierWithNoProxyCIDR(http.ProxyFromEnvironment) } proxyURL, err := proxier(req) if err != nil {