Skip to content

Commit

Permalink
Merge pull request kubernetes#12885 from minikube-bot/auto_bump_golin…
Browse files Browse the repository at this point in the history
…t_version

bump golint version
  • Loading branch information
medyagh authored Nov 9, 2021
2 parents 2ec8875 + 69aa495 commit 40eceaa
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/minikube/bootstrapper/bsutil/kubeadm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/integration/driver_install_or_update_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 40eceaa

Please sign in to comment.