From 99d75c6b5b75d7a85689f2050a917f4d55945420 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Mon, 8 Jun 2020 10:53:47 -0700
Subject: [PATCH] WIP

---
 pkg/minikube/image/image.go | 13 +++----------
 pkg/minikube/node/cache.go  |  2 ++
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkg/minikube/image/image.go b/pkg/minikube/image/image.go
index ea50384699..cf5cfdde9a 100644
--- a/pkg/minikube/image/image.go
+++ b/pkg/minikube/image/image.go
@@ -34,7 +34,6 @@ import (
 	v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/google/go-containerregistry/pkg/v1/daemon"
 	"github.com/google/go-containerregistry/pkg/v1/remote"
-	"github.com/google/go-containerregistry/pkg/v1/tarball"
 	"github.com/pkg/errors"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/localpath"
@@ -101,15 +100,9 @@ func LoadFromTarball(img string) error {
 	p := filepath.Join(constants.ImageCacheDir, img)
 	p = localpath.SanitizeCacheDir(p)
 
-	tag, err := name.NewTag(img)
-	if err != nil {
-		return errors.Wrap(err, "tag")
-	}
-
-	i, err := tarball.ImageFromPath(p, &tag)
-	_, err = daemon.Write(tag, i)
-	if err != nil {
-		return errors.Wrap(err, "writing daemon image")
+	cmd := exec.Command("docker", "load", "-i", p)
+	if output, err := cmd.CombinedOutput(); err != nil {
+		return errors.Wrapf(err, "%s", string(output))
 	}
 	return nil
 }
diff --git a/pkg/minikube/node/cache.go b/pkg/minikube/node/cache.go
index 0760209442..e8c97edf95 100644
--- a/pkg/minikube/node/cache.go
+++ b/pkg/minikube/node/cache.go
@@ -130,6 +130,8 @@ func beginDownloadKicBaseImage(g *errgroup.Group, cc *config.ClusterConfig, down
 				glog.Infof("successfully loaded %s from cached tarball", img)
 				finalImg = img
 				return nil
+			} else {
+				fmt.Println("Failed to load tarball:", err)
 			}
 			glog.Infof("Downloading %s to local daemon", img)
 			err := image.WriteImageToDaemon(img)