Merge pull request #36451 from yujuhong/disable_keepalive

Automatic merge from submit-queue

Disable keep-alive for SSH tunnel health checks

We don't reuse the http client across health checks. Disabling the keep-alive to
properly close the connections.

This fixes #35207

pkg/ssh/ssh.go

@@ -364,6 +364,9 @@ func (l *SSHTunnelList) healthCheck(e sshTunnelEntry) error {
 		Dial: e.Tunnel.Dial,
 		// TODO(cjcullen): Plumb real TLS options through.
 		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+		// We don't reuse the clients, so disable the keep-alive to properly
+		// close the connection.
+		DisableKeepAlives: true,
 	})
 	client := &http.Client{Transport: transport}
 	resp, err := client.Get(l.healthCheckURL.String())