From 0a6c5d8a8758df0395e40b3cf1d125e59d6c88dd Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 13 Jan 2021 17:06:57 -0500 Subject: [PATCH] 17170: Don't reuse transport that might have http2 enabled. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- lib/controller/rpc/conn.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go index 7dd89452be..48e67e2742 100644 --- a/lib/controller/rpc/conn.go +++ b/lib/controller/rpc/conn.go @@ -298,8 +298,9 @@ func (conn *Conn) ContainerSSH(ctx context.Context, options arvados.ContainerSSH // hostname or ::1 or 1::1 addr = net.JoinHostPort(addr, "https") } - netconn, err := tls.Dial("tcp", addr, conn.httpClient.Transport.(*http.Transport).TLSClientConfig) + netconn, err := tls.Dial("tcp", addr, &tls.Config{InsecureSkipVerify: conn.httpClient.Transport.(*http.Transport).TLSClientConfig.InsecureSkipVerify}) if err != nil { + err = fmt.Errorf("tls.Dial: %w", err) return } defer func() { -- 2.30.2