Download golangci-lint via wget

Kubernetes now requires golang 1.13.4. When using golang 1.13.4 to build critest, we run into golangci-lint#659. Fix this by installing the golangci-lint binary for 1.17.1 with curl (similar to how CRI-O currently does), instead of using go mods.

Signed-off-by: Peter Hunt <[email protected]>

Makefile

@@ -95,7 +95,12 @@ lint: $(GOLANGCI_LINT)
 install.tools: $(GOLANGCI_LINT) $(GINKGO)
 
 $(GOLANGCI_LINT):
-	$(call go-build,./vendor/github.com/golangci/golangci-lint/cmd/golangci-lint)
+	export \
+		VERSION=v1.17.1 \
+		URL=https://raw.githubusercontent.com/golangci/golangci-lint \
+		BINDIR=${BUILD_BIN_PATH} && \
+	curl -sfL $$URL/$$VERSION/install.sh | sh -s $$VERSION
+
 
 $(GINKGO):
 	$(call go-build,./vendor/github.com/onsi/ginkgo/ginkgo)

go.mod

@@ -9,18 +9,17 @@ require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	github.com/golang/protobuf v1.3.2
-	github.com/golangci/golangci-lint v1.17.1
 	github.com/onsi/ginkgo v1.10.1
 	github.com/onsi/gomega v1.7.0
 	github.com/opencontainers/go-digest v1.0.0-rc1
 	github.com/opencontainers/selinux v1.2.2
 	github.com/pborman/uuid v1.2.0
 	github.com/sirupsen/logrus v1.4.2
 	github.com/urfave/cli v1.22.1
-	golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
-	golang.org/x/sys v0.0.0-20190730183949-1393eb018365
+	golang.org/x/net v0.0.0-20190923162816-aa69164e4478
+	golang.org/x/sys v0.0.0-20190922100055-0a153f010e69
 	google.golang.org/grpc v1.23.0
-	gopkg.in/yaml.v2 v2.2.2
+	gopkg.in/yaml.v2 v2.2.4
 	k8s.io/api v0.0.0
 	k8s.io/apimachinery v0.0.0
 	k8s.io/client-go v11.0.0+incompatible

tools/tools.go

@@ -19,6 +19,5 @@ limitations under the License.
 package tools
 
 import (
-	_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
 	_ "github.com/onsi/ginkgo/ginkgo"
 )