kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6724 from sayboras/bugfix/lint 

Address one simple linter error
pull/6734/head
Medya Ghazizadeh 2020-02-20 21:10:19 -08:00 committed by GitHub
parent 8507fe3dad 6dfadf643c
commit 70402b4931
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -54,7 +54,7 @@ MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download
KERNEL_VERSION ?= 4.19.94
# latest from https://github.com/golangci/golangci-lint/releases
GOLINT_VERSION ?= v1.23.2
GOLINT_VERSION ?= v1.23.6
# 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

2
pkg/drivers/kic/oci/network.go
View File

@ -49,7 +49,7 @@ func digDNS(ociBin, containerName, dns string) (net.IP, error) {
out, err := cmd.CombinedOutput()
ip := net.ParseIP(strings.TrimSpace(string(out)))
if err != nil {
return ip, errors.Wrapf(err, "resolve dns to ip", string(out))
return ip, errors.Wrapf(err, "resolve dns to ip: %s", string(out))
}
glog.Infof("got host ip for mount in container by digging dns: %s", ip.String())
return ip, nil