feat(platform): ssh suport use env proxy (#2131)

tkestack · Oct 27, 2022 · 267a158 · 267a158
1 parent 4022bcf
commit 267a158
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkg/util/ssh/ssh.go b/pkg/util/ssh/ssh.go
@@ -34,6 +34,7 @@ import (
 	"github.com/pkg/sftp"
 	"github.com/segmentio/ksuid"
 	"golang.org/x/crypto/ssh"
+	"golang.org/x/net/proxy"
 	"gopkg.in/go-playground/validator.v9"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"tkestack.io/tke/pkg/util/log"
@@ -433,7 +434,8 @@ type realSSHDialer struct{}
 var _ sshDialer = &realSSHDialer{}
 
 func (d *realSSHDialer) Dial(network, addr string, config *ssh.ClientConfig) (*ssh.Client, error) {
-	conn, err := net.DialTimeout(network, addr, config.Timeout)
+	dialer := proxy.FromEnvironmentUsing(&net.Dialer{Timeout: config.Timeout})
+	conn, err := dialer.Dial(network, addr)
 	if err != nil {
 		return nil, err
 	}