gofmts files

go.sum

@@ -1405,6 +1405,7 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=

pkg/drivers/kic/oci/cache.go

@@ -3,7 +3,7 @@ package oci
 import (
 	"os/exec"
 	"strings"
-	
+
 	"k8s.io/minikube/pkg/minikube/image"
 )
 
@@ -17,16 +17,16 @@ func ArchiveToDriverCache(ociBin, path string) (string, error) {
 
 // IsInCache
 // searches in OCIBIN's cache for the IMG; returns true if found. no error handling
-func IsImageInCache(ociBin, img string) (bool) {
+func IsImageInCache(ociBin, img string) bool {
 	res, err := runCmd(exec.Command(ociBin, "images", "--format", "{{.Repository}}:{{.Tag}}@{{.Digest}}"))
 	if err != nil {
 		// only the docker binary seems to have this issue..
 		// the docker.io/ substring is cut from the output and formatting doesn't help
 		if ociBin == Docker {
 			img = image.TrimDockerIO(img)
 		}
-		
-		if strings.Contains(res.Stdout.String(), img){
+
+		if strings.Contains(res.Stdout.String(), img) {
 			return true
 		}
 	}

pkg/drivers/kic/oci/download.go

@@ -1,8 +1,8 @@
 package oci
 
 import (
-	"os/exec"
 	"bytes"
+	"os/exec"
 )
 
 func PullImage(ociBin, img string) (bytes.Buffer, error) {

pkg/minikube/download/image.go

@@ -76,9 +76,8 @@ func ImageExistsInKicDriver(ociBin, img string) bool {
 	if inCache {
 		klog.Infof("Found %s in local KICdriver's cache, skipping pull", img)
 		return true
-	} else {
-		return false
 	}
+	return false
 }
 
 // ImageToCache
@@ -194,8 +193,8 @@ func parseImage(img string) (*name.Tag, name.Reference, error) {
 
 // CacheToKICDriver
 // loads a locally minikube-cached container image, to the KIC-driver's cache
-func CacheToKicDriver(ociBin string, img string) (error) {
-	p := imagePathInMinikubeCache(img)	
+func CacheToKicDriver(ociBin string, img string) error {
+	p := imagePathInMinikubeCache(img)
 	resp, err := oci.ArchiveToDriverCache(ociBin, p)
 	klog.V(2).Infof("response: %s", resp)
 	return err
@@ -209,7 +208,7 @@ func ImageToKicDriver(ociBin, img string) error {
 	if err != nil {
 		return err
 	}
-	
+
 	fileLock := filepath.Join(detect.KICCacheDir(), path.Base(img)+".d.lock")
 	fileLock = localpath.SanitizeCacheDir(fileLock)
 	releaser, err := lockDownload(fileLock)
@@ -219,13 +218,12 @@ func ImageToKicDriver(ociBin, img string) error {
 	if err != nil {
 		return err
 	}
-	
+
 	if ImageExistsInKicDriver(ociBin, img) {
 		klog.Infof("%s exists in KicDriver, skipping pull", img)
 		return nil
 	}
 
-
 	if DownloadMock != nil {
 		klog.Infof("Mock download: %s -> daemon", img)
 		return DownloadMock(img, "daemon")

pkg/minikube/node/cache.go

@@ -34,7 +34,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/download"
-	// "k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/image"
 	"k8s.io/minikube/pkg/minikube/localpath"
@@ -163,7 +162,7 @@ func beginDownloadKicBaseImage(g *errgroup.Group, cc *config.ClusterConfig, down
 			if err == nil {
 				klog.Infof("successfully loaded %s from cached tarball", img)
 				isFromCache = true
- 			}
+			}
 
 			klog.Infof("Downloading %s to local KicDriver", img)
 			err = download.ImageToKicDriver(cc.Driver, img)