Merge pull request #4439 from afbjorklund/cache-none

sharifelgamal · web-flow · commit 80e200e81b40 · 2019-06-06T13:13:14.000-07:00
Cache: don't use ssh runner for the none driver
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)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ import (`
`41`	`41`	`"k8s.io/minikube/pkg/minikube/config"`
`42`	`42`	`"k8s.io/minikube/pkg/minikube/constants"`
`43`	`43`	`"k8s.io/minikube/pkg/minikube/cruntime"`
`44`		`- "k8s.io/minikube/pkg/minikube/sshutil"`
`45`	`44`	`)`
`46`	`45`
`47`	`46`	`const tempLoadDir = "/tmp"`
`@@ -129,11 +128,10 @@ func CacheAndLoadImages(images []string) error {`
`129`	`128`	`return err`
`130`	`129`	`}`
`131`	`130`
`132`		`- client, err := sshutil.NewSSHClient(h.Driver)`
	`131`	`+ runner, err := CommandRunner(h)`
`133`	`132`	`if err != nil {`
`134`	`133`	`return err`
`135`	`134`	`}`
`136`		`- runner := bootstrapper.NewSSHRunner(client)`
`137`	`135`	`return LoadImages(runner, images, constants.ImageCacheDir)`
`138`	`136`	`}`
`139`	`137`