early check if image exists at all

pkg/minikube/cruntime/containerd.go

@@ -248,10 +248,14 @@ func (r *Containerd) Disable() error {
 	return r.Init.ForceStop("containerd")
 }
 
-// ImageExists checks if an image exists, expected input format
+// ImageExists checks if image exists based on image name and optionally image sha
 func (r *Containerd) ImageExists(name string, sha string) bool {
-	c := exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo ctr -n=k8s.io images check | grep %s | grep %s", name, sha))
-	if _, err := r.Runner.RunCmd(c); err != nil {
+	c := exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo ctr -n=k8s.io images check | grep %s", name))
+	rr, err := r.Runner.RunCmd(c)
+	if err != nil {
+		return false
+	}
+	if sha != "" && !strings.Contains(rr.Output(), sha) {
 		return false
 	}
 	return true

pkg/minikube/cruntime/crio.go

@@ -162,15 +162,15 @@ func (r *CRIO) Disable() error {
 	return r.Init.ForceStop("crio")
 }
 
-// ImageExists checks if an image exists
+// ImageExists checks if image exists based on image name and optionally image sha
 func (r *CRIO) ImageExists(name string, sha string) bool {
 	// expected output looks like [NAME@sha256:SHA]
 	c := exec.Command("sudo", "podman", "image", "inspect", "--format", "{{.Id}}", name)
 	rr, err := r.Runner.RunCmd(c)
 	if err != nil {
 		return false
 	}
-	if !strings.Contains(rr.Output(), sha) {
+	if sha != "" && !strings.Contains(rr.Output(), sha) {
 		return false
 	}
 	return true

pkg/minikube/cruntime/cruntime.go

@@ -106,7 +106,7 @@ type Manager interface {
 	// Tag an image
 	TagImage(string, string) error
 
-	// ImageExists takes image name and image sha checks if an it exists
+	// ImageExists takes image name and optionally image sha to check if an image exists
 	ImageExists(string, string) bool
 	// ListImages returns a list of images managed by this container runtime
 	ListImages(ListImagesOptions) ([]string, error)

pkg/minikube/cruntime/docker.go

@@ -165,15 +165,15 @@ func (r *Docker) Disable() error {
 	return r.Init.Mask("docker.service")
 }
 
-// ImageExists checks if an image exists
+// ImageExists checks if image exists based on image name and optionally image sha
 func (r *Docker) ImageExists(name string, sha string) bool {
 	// expected output looks like [SHA_ALGO:SHA]
 	c := exec.Command("docker", "image", "inspect", "--format", "{{.Id}}", name)
 	rr, err := r.Runner.RunCmd(c)
 	if err != nil {
 		return false
 	}
-	if !strings.Contains(rr.Output(), sha) {
+	if sha != "" && !strings.Contains(rr.Output(), sha) {
 		return false
 	}
 	return true

pkg/minikube/machine/cache_images.go

@@ -461,6 +461,10 @@ func transferAndSaveImage(cr command.Runner, k8s config.KubernetesConfig, dst st
 		return errors.Wrap(err, "runtime")
 	}
 
+	if !r.ImageExists(imgName, "") {
+		return errors.Errorf("image %s not found", imgName)
+	}
+
 	klog.Infof("Saving image to: %s", dst)
 	filename := filepath.Base(dst)