From dba9076cc39657b7e636dbdb9e018b5e880a9d75 Mon Sep 17 00:00:00 2001 From: Andriy Dzikh Date: Wed, 28 Apr 2021 13:43:36 -0700 Subject: [PATCH] Add mock mode check for ImageToCache and ImageToDaemon, similar to download.download. --- pkg/minikube/download/image.go | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkg/minikube/download/image.go b/pkg/minikube/download/image.go index e7f9d88fd7..8f8b73c3d2 100644 --- a/pkg/minikube/download/image.go +++ b/pkg/minikube/download/image.go @@ -36,10 +36,12 @@ import ( "k8s.io/minikube/pkg/minikube/localpath" ) -var defaultPlatform = v1.Platform{ - Architecture: runtime.GOARCH, - OS: "linux", -} +var ( + defaultPlatform = v1.Platform{ + Architecture: runtime.GOARCH, + OS: "linux", + } +) // ImageExistsInCache if img exist in local cache directory func ImageExistsInCache(img string) bool { @@ -87,6 +89,13 @@ func ImageToCache(img string) error { return errors.Wrapf(err, "making cache image directory: %s", f) } + if mockMode { + klog.Infof("Mock download: %s -> %s", img, f) + // Callers expect the file to exist + _, err := os.Create(f) + return err + } + // buffered channel c := make(chan v1.Update, 200) @@ -157,6 +166,12 @@ func ImageToDaemon(img string) error { if err != nil { return errors.Wrap(err, "parsing reference") } + + if mockMode { + klog.Infof("Mock download: %s -> daemon", img) + return nil + } + klog.V(3).Infof("Getting image %v", ref) i, err := remote.Image(ref, remote.WithPlatform(defaultPlatform)) if err != nil { @@ -170,6 +185,7 @@ func ImageToDaemon(img string) error { return errors.Wrap(err, "getting remote image") } + klog.V(3).Infof("Writing image %v", ref) errchan := make(chan error) p := pb.Full.Start64(0)