1
0
mirror of https://github.com/rancher/rke.git synced 2025-09-13 13:40:22 +00:00

Update to k8s 1.17

This commit is contained in:
Darren Shepherd
2020-01-23 15:52:10 -07:00
parent b7dbac41f2
commit 1bcf620a89
393 changed files with 37126 additions and 6732 deletions

View File

@@ -5,6 +5,7 @@
package proxy
import (
"context"
"net"
"strings"
)
@@ -41,6 +42,20 @@ func (p *PerHost) Dial(network, addr string) (c net.Conn, err error) {
return p.dialerForRequest(host).Dial(network, addr)
}
// DialContext connects to the address addr on the given network through either
// defaultDialer or bypass.
func (p *PerHost) DialContext(ctx context.Context, network, addr string) (c net.Conn, err error) {
host, _, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
}
d := p.dialerForRequest(host)
if x, ok := d.(ContextDialer); ok {
return x.DialContext(ctx, network, addr)
}
return dialContext(ctx, d, network, addr)
}
func (p *PerHost) dialerForRequest(host string) Dialer {
if ip := net.ParseIP(host); ip != nil {
for _, net := range p.bypassNetworks {