From 4201bbcfe39f4b627463422ce16020f736ed3601 Mon Sep 17 00:00:00 2001 From: sayboras Date: Fri, 21 Feb 2020 11:45:46 +1100 Subject: [PATCH 1/2] Address one simple linter error --- pkg/drivers/kic/oci/network.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/drivers/kic/oci/network.go b/pkg/drivers/kic/oci/network.go index 43fe0ed8cd..5e27528b5f 100644 --- a/pkg/drivers/kic/oci/network.go +++ b/pkg/drivers/kic/oci/network.go @@ -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 From 6dfadf643cb4593729ad9a08ba93ab93b06f5027 Mon Sep 17 00:00:00 2001 From: Tam Mach Date: Fri, 21 Feb 2020 11:59:57 +1100 Subject: [PATCH 2/2] Upgrade patch version for golangci-lint to v1.23.6 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 68e63165ab..3b29c3922b 100755 --- a/Makefile +++ b/Makefile @@ -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