kicbase: simplify image loadinglogic further

This further simplifies the logic in beginDownloadKicBaseImage().

In particular, it removes the special case for podman,
leaving the loading from cache unimplemented without issuing
a confusing log message.

Signed-off-by: Michael Adam <obnox@samba.org>

Author: obnoxxx

pkg/minikube/node/cache.go

@@ -154,31 +154,33 @@ func beginDownloadKicBaseImage(g *errgroup.Group, cc *config.ClusterConfig, down
 		var err error
 		for _, img := range append([]string{baseImg}, kic.FallbackImages...) {
 
-			if driver.IsDocker(cc.Driver) && download.ImageExistsInDaemon(img) && !downloadOnly {
-				klog.Infof("%s exists in daemon, skipping load", img)
-				finalImg = img
-				return nil
-			}
+			if driver.IsDocker(cc.Driver) {
+				if download.ImageExistsInDaemon(img) {
+					klog.Infof("%s exists in daemon, skipping load", img)
+					finalImg = img
+					return nil
+				}
 
-			klog.Infof("Downloading %s to local cache", img)
-			err = download.ImageToCache(img)
-			if err == nil {
-				klog.Infof("successfully saved %s as a tarball", img)
-			}
-			if downloadOnly {
-				return nil
-			}
+				klog.Infof("Downloading %s to local cache", img)
+				err = download.ImageToCache(img)
+				if err == nil {
+					klog.Infof("successfully saved %s as a tarball", img)
+				}
+				if downloadOnly {
+					return nil
+				}
 
-			if cc.Driver == driver.Podman {
-				return fmt.Errorf("not yet implemented, see issue #8426")
-			}
-			if driver.IsDocker(cc.Driver) {
 				klog.Infof("Loading %s from local cache", img)
 				if finalImg, err = download.CacheToDaemon(img); err == nil {
 					klog.Infof("successfully loaded and using %s from cached tarball", img)
 					return nil
 				}
 			}
+			if cc.Driver == driver.Podman {
+				return fmt.Errorf("skipping image load via cache: not implemented for podman.  see issue #8426")
+
+			}
+
 			klog.Infof("failed to download %s, will try fallback image if available: %v", img, err)
 		}
 		// second if we failed to download any fallback image