From 09328fd571833f367ff90875674ce66614da2b1f Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 8 Nov 2021 10:01:50 +0000 Subject: [PATCH 1/2] bump golaint versions --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4e49066be368..773ffc23f585 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,7 @@ MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download KERNEL_VERSION ?= 4.19.202 # latest from https://github.com/golangci/golangci-lint/releases # update this only by running `make update-golint-version` -GOLINT_VERSION ?= v1.42.1 +GOLINT_VERSION ?= v1.43.0 # Limit number of default jobs, to avoid the CI builds running out of memory GOLINT_JOBS ?= 4 # see https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint From 69aa495d024b04d3cfce9c4a0591cd66931d40e2 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 8 Nov 2021 09:23:00 -0500 Subject: [PATCH 2/2] address lint concerns --- pkg/minikube/bootstrapper/bsutil/kubeadm_test.go | 4 ++-- test/integration/driver_install_or_update_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go b/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go index 424b7155adda..ea67f7331fab 100644 --- a/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go +++ b/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go @@ -103,10 +103,10 @@ func recentReleases(n int) ([]string, error) { foundDefault := false for _, v := range versions { - if strings.HasPrefix(constants.NewestKubernetesVersion, v) { + if strings.HasPrefix(constants.NewestKubernetesVersion, v) { //nolint:gocritic // Complains "constants.NewestKubernetesVersion and v arguments order looks reversed" foundNewest = true } - if strings.HasPrefix(constants.DefaultKubernetesVersion, v) { + if strings.HasPrefix(constants.DefaultKubernetesVersion, v) { //nolint:gocritic // Same as above foundDefault = true } } diff --git a/test/integration/driver_install_or_update_test.go b/test/integration/driver_install_or_update_test.go index b0cedaca33a1..617f05d7132f 100644 --- a/test/integration/driver_install_or_update_test.go +++ b/test/integration/driver_install_or_update_test.go @@ -293,7 +293,7 @@ func prepareTempMinikubeDirWithHyperkitDriver(name, driver string) (string, stri } // try to copy cached files to the temp minikube folder to avoid downloading of iso and preloads - _ = CopyDir(filepath.Join(localpath.MakeMiniPath("cache")), filepath.Join(mkDir, "cache")) + _ = CopyDir(localpath.MakeMiniPath("cache"), filepath.Join(mkDir, "cache")) // change permission to allow driver to be executable if err = os.Chmod(testDriverPath, 0755); err != nil {