remove progress bar for kic download when JSON output

Author: spowelljr

go.sum

@@ -1405,6 +1405,7 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=

pkg/minikube/download/image.go

@@ -36,6 +36,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/detect"
 	"k8s.io/minikube/pkg/minikube/image"
 	"k8s.io/minikube/pkg/minikube/localpath"
+	"k8s.io/minikube/pkg/minikube/out"
 )
 
 var (
@@ -140,6 +141,12 @@ func ImageToCache(img string) error {
 		return errors.Wrap(err, "getting remote image")
 	}
 	klog.V(3).Infof("Writing image %v", tag)
+	if out.JSON {
+		if err := tarball.WriteToFile(f, tag, i); err != nil {
+			return errors.Wrap(err, "writing tarball image")
+		}
+		return nil
+	}
 	errchan := make(chan error)
 	p := pb.Full.Start64(0)
 	fn := strings.Split(ref.Name(), "@")[0]
@@ -271,37 +278,43 @@ func ImageToDaemon(img string) error {
 	}
 
 	klog.V(3).Infof("Writing image %v", tag)
-	errchan := make(chan error)
-	p := pb.Full.Start64(0)
-	fn := strings.Split(ref.Name(), "@")[0]
-	// abbreviate filename for progress
-	maxwidth := 30 - len("...")
-	if len(fn) > maxwidth {
-		fn = fn[0:maxwidth] + "..."
-	}
-	p.Set("prefix", "    > "+fn+": ")
-	p.Set(pb.Bytes, true)
-
-	// Just a hair less than 80 (standard terminal width) for aesthetics & pasting into docs
-	p.SetWidth(79)
-
-	go func() {
-		_, err = daemon.Write(tag, i)
-		errchan <- err
-	}()
-	var update v1.Update
-loop:
-	for {
-		select {
-		case update = <-c:
-			p.SetCurrent(update.Complete)
-			p.SetTotal(update.Total)
-		case err = <-errchan:
-			p.Finish()
-			if err != nil {
-				return errors.Wrap(err, "writing daemon image")
+	if out.JSON {
+		if _, err := daemon.Write(tag, i); err != nil {
+			return errors.Wrap(err, "writing daemon image")
+		}
+	} else {
+		errchan := make(chan error)
+		p := pb.Full.Start64(0)
+		fn := strings.Split(ref.Name(), "@")[0]
+		// abbreviate filename for progress
+		maxwidth := 30 - len("...")
+		if len(fn) > maxwidth {
+			fn = fn[0:maxwidth] + "..."
+		}
+		p.Set("prefix", "    > "+fn+": ")
+		p.Set(pb.Bytes, true)
+
+		// Just a hair less than 80 (standard terminal width) for aesthetics & pasting into docs
+		p.SetWidth(79)
+
+		go func() {
+			_, err = daemon.Write(tag, i)
+			errchan <- err
+		}()
+		var update v1.Update
+	loop:
+		for {
+			select {
+			case update = <-c:
+				p.SetCurrent(update.Complete)
+				p.SetTotal(update.Total)
+			case err = <-errchan:
+				p.Finish()
+				if err != nil {
+					return errors.Wrap(err, "writing daemon image")
+				}
+				break loop
 			}
-			break loop
 		}
 	}
 	klog.V(3).Infof("Pulling image %v", ref)