kicbase: simplify the image loading logic

This change refactors beginDownloadKicBaseImage() a bit to
achieve a more streamlined flow of logic, combining
redundant blocks.

In the special case of  podman,
it leaves image loading from cache  loading from cache unimplemented
and removes the confusing and unhelpful message.

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

Author: obnoxxx

pkg/minikube/node/cache.go

@@ -135,6 +135,10 @@ func beginDownloadKicBaseImage(g *errgroup.Group, cc *config.ClusterConfig, down
 	register.Reg.SetStep(register.PullingBaseImage)
 	out.Step(style.Pulling, "Pulling base image {{.kicVersion}} ...", out.V{"kicVersion": kic.Version})
 	g.Go(func() error {
+		if cc.Driver == driver.Podman {
+			klog.Infof("skipping load for podman driver: letting podman download.")
+			return nil
+		}
 		baseImg := cc.KicBaseImage
 		if baseImg == kic.BaseImage && len(cc.KubernetesConfig.ImageRepository) != 0 {
 			baseImg = updateKicImageRepo(baseImg, cc.KubernetesConfig.ImageRepository)
@@ -154,25 +158,22 @@ 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 && err == nil {
-				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) && err == nil {
 				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)