diff --git a/pkg/minikube/download/preload.go b/pkg/minikube/download/preload.go index 09e0d8d35e76..4a4979acc0a7 100644 --- a/pkg/minikube/download/preload.go +++ b/pkg/minikube/download/preload.go @@ -23,7 +23,7 @@ import ( "io/ioutil" "net/http" "os" - "path" + "path/filepath" "cloud.google.com/go/storage" "google.golang.org/api/option" @@ -59,14 +59,14 @@ func targetDir() string { return localpath.MakeMiniPath("cache", "preloaded-tarball") } -// PreloadChecksumPath returns path to checksum file +// PreloadChecksumPath returns the local path to the cached checksum file func PreloadChecksumPath(k8sVersion string) string { - return path.Join(targetDir(), checksumName(k8sVersion)) + return filepath.Join(targetDir(), checksumName(k8sVersion)) } -// TarballPath returns the path to the preloaded tarball +// TarballPath returns the local path to the cached preload tarball func TarballPath(k8sVersion string) string { - return path.Join(targetDir(), TarballName(k8sVersion)) + return filepath.Join(targetDir(), TarballName(k8sVersion)) } // remoteTarballURL returns the URL for the remote tarball in GCS @@ -122,7 +122,7 @@ func Preload(k8sVersion, containerRuntime string) error { return nil } - out.T(out.FileDownload, "Downloading preloaded images tarball for k8s {{.version}} ...", out.V{"version": k8sVersion}) + out.T(out.FileDownload, "Downloading Kubernetes {{.version}} preload ...", out.V{"version": k8sVersion}) url := remoteTarballURL(k8sVersion) tmpDst := targetPath + ".download" diff --git a/pkg/minikube/node/cache.go b/pkg/minikube/node/cache.go index f1b3ac8f321b..ebeb04fdc0b3 100644 --- a/pkg/minikube/node/cache.go +++ b/pkg/minikube/node/cache.go @@ -100,6 +100,7 @@ func doCacheBinaries(k8sVersion string) error { // BeginDownloadKicArtifacts downloads the kic image + preload tarball, returns true if preload is available func beginDownloadKicArtifacts(g *errgroup.Group) { + out.T(out.Pulling, "Pulling base image ...") glog.Info("Beginning downloading kic artifacts") g.Go(func() error { glog.Infof("Downloading %s to local daemon", kic.BaseImage)