Merge pull request #4439 from afbjorklund/cache-none

Cache: don't use ssh runner for the none driver
kubernetes · Jun 6, 2019 · 80e200e · 80e200e
2 parents 70cdf33 + f4aaef7
commit 80e200e
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/pkg/minikube/machine/cache_images.go b/pkg/minikube/machine/cache_images.go
@@ -41,7 +41,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/cruntime"
-	"k8s.io/minikube/pkg/minikube/sshutil"
 )
 
 const tempLoadDir = "/tmp"
@@ -129,11 +128,10 @@ func CacheAndLoadImages(images []string) error {
 		return err
 	}
 
-	client, err := sshutil.NewSSHClient(h.Driver)
+	runner, err := CommandRunner(h)
 	if err != nil {
 		return err
 	}
-	runner := bootstrapper.NewSSHRunner(client)
 	return LoadImages(runner, images, constants.ImageCacheDir)
 }