github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Honor custom transport dialer

Browse Source
This commit is contained in:
Jordan Liggitt 2018-06-27 16:33:32 -04:00
parent 23000cfbd3
commit 51eb52cc8f
No known key found for this signature in database
GPG Key ID: 39928704103C7229
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
staging/src/k8s.io/apimachinery/pkg/util/net/http.go
View File

@ -91,7 +91,8 @@ func SetOldTransportDefaults(t *http.Transport) *http.Transport {
// ProxierWithNoProxyCIDR allows CIDR rules in NO_PROXY // ProxierWithNoProxyCIDR allows CIDR rules in NO_PROXY
t.Proxy = NewProxierWithNoProxyCIDR(http.ProxyFromEnvironment) t.Proxy = NewProxierWithNoProxyCIDR(http.ProxyFromEnvironment)
} }
if t.DialContext == nil { // If no custom dialer is set, use the default context dialer
if t.DialContext == nil && t.Dial == nil {
t.DialContext = defaultTransport.DialContext t.DialContext = defaultTransport.DialContext
} }
if t.TLSHandshakeTimeout == 0 { if t.TLSHandshakeTimeout == 0 {
@ -129,7 +130,18 @@ func DialerFor(transport http.RoundTripper) (DialFunc, error) {
switch transport := transport.(type) { switch transport := transport.(type) {
case *http.Transport: case *http.Transport:
// transport.DialContext takes precedence over transport.Dial
if transport.DialContext != nil {
return transport.DialContext, nil return transport.DialContext, nil
}
// adapt transport.Dial to the DialWithContext signature
if transport.Dial != nil {
return func(ctx context.Context, net, addr string) (net.Conn, error) {
return transport.Dial(net, addr)
}, nil
}
// otherwise return nil
return nil, nil
case RoundTripperWrapper: case RoundTripperWrapper:
return DialerFor(transport.WrappedRoundTripper()) return DialerFor(transport.WrappedRoundTripper())
default: default: