kicbase: simplify the image loading logic

obnoxxx · obnoxxx · commit 51afbc6b78e1 · 2025-12-02T13:22:53.000+01:00
This change refactors beginDownloadKicBaseImage() a bit to

a more streamlined flow of logic, combining
redundant blocks.

Signed-off-by: Michael Adam &lt;obnox@samba.org&gt;
diff --git a/pkg/minikube/node/cache.go b/pkg/minikube/node/cache.go
@@ -165,14 +165,14 @@ func beginDownloadKicBaseImage(g *errgroup.Group, cc *config.ClusterConfig, down
 			if err == nil {
 				klog.Infof("successfully saved %s as a tarball", img)
 			}
-			if downloadOnly && err == nil {
+			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 {
+			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)

Original file line number	Diff line number	Diff line change
`@@ -165,14 +165,14 @@ func beginDownloadKicBaseImage(g errgroup.Group, cc config.ClusterConfig, down`
`165`	`165`	`if err == nil {`
`166`	`166`	`klog.Infof("successfully saved %s as a tarball", img)`
`167`	`167`	`}`
`168`		`- if downloadOnly && err == nil {`
	`168`	`+ if downloadOnly {`
`169`	`169`	`return nil`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`if cc.Driver == driver.Podman {`
`173`	`173`	`return fmt.Errorf("not yet implemented, see issue #8426")`
`174`	`174`	`}`
`175`		`- if driver.IsDocker(cc.Driver) && err == nil {`
	`175`	`+ if driver.IsDocker(cc.Driver) {`
`176`	`176`	`klog.Infof("Loading %s from local cache", img)`
`177`	`177`	`if finalImg, err = download.CacheToDaemon(img); err == nil {`
`178`	`178`	`klog.Infof("successfully loaded and using %s from cached tarball", img)`