diff --git a/Makefile b/Makefile index fcddd786ca2656c126a861f48cd56cbc41138dfe..2fe1edbe2fd154f01fe12698e7be4e6255fd4936 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download KERNEL_VERSION ?= 4.19.107 # latest from https://github.com/golangci/golangci-lint/releases -GOLINT_VERSION ?= v1.26.0 +GOLINT_VERSION ?= v1.29.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 diff --git a/hack/preload-images/generate.go b/hack/preload-images/generate.go index fe2517e293642a2a4c927277c3cecd3efe72865f..ec3de2ece5066fd12de0c7c20b9627aa7d809c84 100644 --- a/hack/preload-images/generate.go +++ b/hack/preload-images/generate.go @@ -173,11 +173,11 @@ func createImageTarball(tarballFilename, containerRuntime string) error { } if containerRuntime == "containerd" { - dirs = append(dirs, fmt.Sprintf("./lib/containerd")) + dirs = append(dirs, "./lib/containerd") } if containerRuntime == "cri-o" { - dirs = append(dirs, fmt.Sprintf("./lib/containers")) + dirs = append(dirs, "./lib/containers") } args := []string{"exec", profile, "sudo", "tar", "-I", "lz4", "-C", "/var", "-cvf", tarballFilename} diff --git a/pkg/drivers/hyperkit/driver.go b/pkg/drivers/hyperkit/driver.go index fee33925d04980d9bdabb24b5e98c63923e5416d..ec828297775f662dcc8d6f8268f9454a68e2bcc4 100644 --- a/pkg/drivers/hyperkit/driver.go +++ b/pkg/drivers/hyperkit/driver.go @@ -397,7 +397,7 @@ func (d *Driver) Stop() error { d.cleanupNfsExports() err := d.sendSignal(syscall.SIGTERM) if err != nil { - return errors.Wrap(err, fmt.Sprintf("hyperkit sigterm failed")) + return errors.Wrap(err, "hyperkit sigterm failed") } // wait 5s for graceful shutdown @@ -406,7 +406,7 @@ func (d *Driver) Stop() error { time.Sleep(time.Second * 1) s, err := d.GetState() if err != nil { - return errors.Wrap(err, fmt.Sprintf("hyperkit waiting graceful shutdown failed")) + return errors.Wrap(err, "hyperkit waiting graceful shutdown failed") } if s == state.Stopped { return nil @@ -468,7 +468,7 @@ func (d *Driver) setupNFSShare() error { return err } - mountCommands := fmt.Sprintf("#/bin/bash\\n") + mountCommands := "#/bin/bash\\n" log.Info(d.IPAddress) for _, share := range d.NFSShares { diff --git a/pkg/minikube/bootstrapper/bsutil/ops.go b/pkg/minikube/bootstrapper/bsutil/ops.go index f92f17536779c6fd08d79d1daf371f36a63fa717..627ab5f38527634904fd10e8599f1e10be285d0a 100644 --- a/pkg/minikube/bootstrapper/bsutil/ops.go +++ b/pkg/minikube/bootstrapper/bsutil/ops.go @@ -17,7 +17,6 @@ limitations under the License. package bsutil import ( - "fmt" "os/exec" "strings" @@ -42,7 +41,7 @@ func AdjustResourceLimits(c command.Runner) error { // Prevent the apiserver from OOM'ing before other pods, as it is our gateway into the cluster. // It'd be preferable to do this via Kubernetes, but kubeadm doesn't have a way to set pod QoS. if _, err = c.RunCmd(exec.Command("/bin/bash", "-c", "echo -10 | sudo tee /proc/$(pgrep kube-apiserver)/oom_adj")); err != nil { - return errors.Wrap(err, fmt.Sprintf("oom_adj adjust")) + return errors.Wrap(err, "oom_adj adjust") } return nil } diff --git a/test/stress/stress.sh b/test/stress/stress.sh index 0f63a58033cda1554e170cf0bd23e447a3f18b60..d1c3673f5092b4ada5a019ce3fbc519ae90d95c2 100755 --- a/test/stress/stress.sh +++ b/test/stress/stress.sh @@ -13,6 +13,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + # # Stress test for start, restart, upgrade. #