fix: Set the client DialContext to the connhelper dialer when accessing an SSH DOCKER_HOST (GoogleContainerTools#9521)

aran · web-flow · commit 5fae4ba1f08c · 2024-11-08T16:42:47.000-05:00
Summary: Fixes GoogleContainerTools#9484 Test Plan: Tested skaffold over a ssh connection to minikube. This was tested with and without GoogleContainerTools#9512 in place.
diff --git a/pkg/skaffold/docker/client.go b/pkg/skaffold/docker/client.go
@@ -104,7 +104,11 @@ func newEnvAPIClient() ([]string, client.CommonAPIClient, error) {
 					DialContext: helper.Dialer,
 				},
 			}
-			opts = append(opts, client.WithHTTPClient(httpClient), client.WithHost(helper.Host))
+			opts = append(opts,
+				client.WithHTTPClient(httpClient),
+				client.WithHost(helper.Host),
+				client.WithDialContext(helper.Dialer),
+			)
 		} else {
 			opts = append(opts, client.FromEnv)
 		}

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,11 @@ func newEnvAPIClient() ([]string, client.CommonAPIClient, error) {`
`104`	`104`	`DialContext: helper.Dialer,`
`105`	`105`	`},`
`106`	`106`	`}`
`107`		`- opts = append(opts, client.WithHTTPClient(httpClient), client.WithHost(helper.Host))`
	`107`	`+ opts = append(opts,`
	`108`	`+ client.WithHTTPClient(httpClient),`
	`109`	`+ client.WithHost(helper.Host),`
	`110`	`+ client.WithDialContext(helper.Dialer),`
	`111`	`+ )`
`108`	`112`	`} else {`
`109`	`113`	`opts = append(opts, client.FromEnv)`
`110`	`114`	`}`