From ff855fda3a5aa4a16b273d605314da306bfb5898 Mon Sep 17 00:00:00 2001 From: Aran Donohue Date: Sat, 7 Sep 2024 20:34:17 -0700 Subject: [PATCH] fix: Set the client DialContext to the connhelper dialer when accessing an SSH DOCKER_HOST Summary: Fixes #9484 Test Plan: Tested skaffold over a ssh connection to minikube. This was tested with and without #9512 in place. --- pkg/skaffold/docker/client.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/skaffold/docker/client.go b/pkg/skaffold/docker/client.go index b580c78cb67..c0907d7c4c1 100644 --- 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) }