Load kicbase image from right cache and add log

It was silently failing to load from the (wrong) cache directory,
causing the image to be download twice from the network instead.

Author: afbjorklund

pkg/minikube/image/image.go

@@ -164,11 +164,12 @@ func ExistsImageInDaemon(binary, img string) bool {
 	return false
 }
 
-// LoadFromTarball checks if the image exists as a tarball and tries to load it to the local daemon
-func LoadFromTarball(binary, img string) error {
-	p := filepath.Join(constants.ImageCacheDir, img)
+// LoadImageFromCache loads img from the local cache directory
+func LoadImageFromCache(binary, img string) error {
+	p := filepath.Join(constants.KICCacheDir, path.Base(img)+".tar")
 	p = localpath.SanitizeCacheDir(p)
 
+	klog.Infof("Loading %s from local cache", img)
 	switch binary {
 	case driver.Podman:
 		tag, err := name.NewTag(Tag(img))
@@ -181,7 +182,8 @@ func LoadFromTarball(binary, img string) error {
 			return errors.Wrap(err, "tarball")
 		}
 
-		_, err = PodmanWrite(tag, i)
+		resp, err := PodmanWrite(tag, i)
+		klog.V(2).Infof("response: %s", resp)
 		return err
 	case driver.Docker:
 		tag, err := name.NewTag(Tag(img))
@@ -194,7 +196,8 @@ func LoadFromTarball(binary, img string) error {
 			return errors.Wrap(err, "tarball")
 		}
 
-		_, err = daemon.Write(tag, i)
+		resp, err := daemon.Write(tag, i)
+		klog.V(2).Infof("response: %s", resp)
 		return err
 	}
 	return fmt.Errorf("unknown binary: %s", binary)

pkg/minikube/node/cache.go

@@ -144,14 +144,16 @@ func beginDownloadKicBaseImage(g *errgroup.Group, cc *config.ClusterConfig, down
 			if downloadOnly {
 				return err
 			}
-			if err := image.LoadFromTarball(cc.Driver, img); err == nil {
+			if err := image.LoadImageFromCache(cc.Driver, img); err == nil {
 				klog.Infof("successfully loaded %s from cached tarball", img)
 				// strip the digest from the img before saving it in the config
 				// because loading an image from tarball to daemon doesn't load the digest
 				finalImg = img
 				return nil
 			}
 
+			klog.Infof("failed to load %s, will try remote image if available: %v", img, err)
+
 			klog.Infof("Downloading %s to local daemon", img)
 			if err = image.WriteImageToDaemon(cc.Driver, img); err == nil {
 				klog.Infof("successfully downloaded %s", img)