Update go mod and mount library

kubernetes-sigs · Feb 27, 2020 · 5047860 · 5047860
1 parent 634d2b1
commit 5047860
Show file tree

Hide file tree

Showing 21 changed files with 829 additions and 541 deletions.
diff --git a/Makefile b/Makefile
@@ -21,17 +21,28 @@ LDFLAGS?="-X ${PKG}/pkg/driver.driverVersion=${VERSION} -X ${PKG}/pkg/driver.git
 GO111MODULE=on
 GOPROXY=direct
 GOPATH=$(shell go env GOPATH)
+GOBIN=$(shell pwd)/bin
 
 .EXPORT_ALL_VARIABLES:
 
-.PHONY: aws-ebs-csi-driver
-aws-ebs-csi-driver:
+bin/aws-ebs-csi-driver:
 	mkdir -p bin
 	CGO_ENABLED=0 GOOS=linux go build -ldflags ${LDFLAGS} -o bin/aws-ebs-csi-driver ./cmd/
 
-.PHONY: verify
-verify:
-	./hack/verify-all
+bin/mockgen:
+	go get github.com/golang/mock/mockgen@latest
+
+bin/golangci-lint:
+	echo "Installing golangci-lint..."
+	curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s v1.21.0
+
+mockgen: bin/mockgen
+	./hack/update-gomock
+
+verify: bin/golangci-lint
+	echo "Running golangci-lint..."
+	./bin/golangci-lint run --deadline=10m
+	echo "Congratulations! All Go source files have been linted."
 
 .PHONY: test
 test:
@@ -41,8 +52,7 @@ test:
 test-sanity:
 	go test -v ./tests/sanity/...
 
-.PHONY: tester
-tester:
+bin/k8s-e2e-tester:
 	go get github.com/aws/aws-k8s-tester/e2e/tester/cmd/k8s-e2e-tester@master
 
 .PHONY: test-integration
@@ -51,12 +61,12 @@ test-integration:
 	echo "succeed"
 
 .PHONY: test-e2e-single-az
-test-e2e-single-az: tester
-	TESTCONFIG=./tester/single-az-config.yaml ${GOPATH}/bin/k8s-e2e-tester
+test-e2e-single-az: bin/k8s-e2e-tester
+	TESTCONFIG=./tester/single-az-config.yaml ${GOBIN}/k8s-e2e-tester
 
 .PHONY: test-e2e-multi-az
-test-e2e-multi-az: tester
-	TESTCONFIG=./tester/multi-az-config.yaml ${GOPATH}/bin/k8s-e2e-tester
+test-e2e-multi-az: bin/k8s-e2e-tester
+	TESTCONFIG=./tester/multi-az-config.yaml ${GOBIN}/k8s-e2e-tester
 
 .PHONY: test-e2e-migration
 test-e2e-migration:

diff --git a/go.mod b/go.mod
@@ -3,83 +3,54 @@ module github.com/kubernetes-sigs/aws-ebs-csi-driver
 require (
 	github.com/aws/aws-k8s-tester/e2e/tester v0.0.0-20191204032858-d97ad2e4255e // indirect
 	github.com/aws/aws-sdk-go v1.23.21
-	github.com/container-storage-interface/spec v1.1.0
-	github.com/coreos/go-semver v0.2.0 // indirect
-	github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 // indirect
+	github.com/container-storage-interface/spec v1.2.0
 	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
-	github.com/docker/distribution v2.7.0+incompatible // indirect
 	github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
 	github.com/elazarl/goproxy v0.0.0-20181111060418-2ce16c963a8a // indirect
-	github.com/emicklei/go-restful v2.8.0+incompatible // indirect
-	github.com/fatih/camelcase v1.0.0 // indirect
-	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/gogo/protobuf v1.1.1 // indirect
-	github.com/golang/lint v0.0.0-20180702182130-06c8688daad7 // indirect
-	github.com/golang/mock v1.2.0
-	github.com/golang/protobuf v1.3.2
-	github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c // indirect
-	github.com/gorilla/websocket v1.4.0 // indirect
+	github.com/golang/mock v1.4.1
+	github.com/golang/protobuf v1.3.3
 	github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f // indirect
-	github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 // indirect
-	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway v1.5.1 // indirect
-	github.com/jonboulle/clockwork v0.1.0 // indirect
-	github.com/json-iterator/go v1.1.5 // indirect
-	github.com/kisielk/gotool v1.0.0 // indirect
 	github.com/kubernetes-csi/csi-test v2.0.0+incompatible
-	github.com/kubernetes-csi/external-snapshotter v1.2.2
 	github.com/kubernetes-csi/external-snapshotter/v2 v2.0.1
 	github.com/onsi/ginkgo v1.10.2
-	github.com/onsi/gomega v1.4.3
-	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
-	github.com/soheilhy/cmux v0.1.4 // indirect
-	github.com/spf13/afero v1.1.2 // indirect
-	github.com/spf13/cobra v0.0.3 // indirect
-	github.com/spf13/pflag v1.0.3 // indirect
+	github.com/onsi/gomega v1.7.0
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6 // indirect
-	go.uber.org/atomic v1.3.2 // indirect
-	go.uber.org/multierr v1.1.0 // indirect
-	go.uber.org/zap v1.9.1 // indirect
-	golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529 // indirect
-	golang.org/x/text v0.3.2 // indirect
-	golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
+	golang.org/x/net v0.0.0-20200226051749-491c5fce7268 // indirect
 	google.golang.org/grpc v1.26.0
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/square/go-jose.v2 v2.2.1 // indirect
-	k8s.io/api v0.17.0
-	k8s.io/apimachinery v0.17.1-beta.0
-	k8s.io/client-go v0.17.0
-	k8s.io/component-base v0.17.0
+	k8s.io/api v0.17.3
+	k8s.io/apimachinery v0.17.3
+	k8s.io/client-go v0.17.3
+	k8s.io/component-base v0.17.3
 	k8s.io/klog v1.0.0
-	k8s.io/kubernetes v1.15.2
+	k8s.io/kubernetes v1.17.3
+	k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20190805141119-fdd30b57c827
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190805143126-cdb999c96590
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
-	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190805142138-368b2058237c
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190805143448-a07e59fb081d
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20190805141520-2fe0317bcee0
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190805144409-8484242760e7
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190805144246-c01ee70854a1
-	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
-	k8s.io/component-base => k8s.io/component-base v0.0.0-20190805141645-3a5e5ac800ae
-	k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190531030430-6117653b35f1
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190805144531-3985229e1802
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190805142416-fd821fbbb94e
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190805144128-269742da31dd
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190805143734-7f1675b90353
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190805144012-2a1ed1f3d8a4
-	k8s.io/kubectl => k8s.io/kubectl v0.0.0-20190602132728-7075c07e78bf
-	k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190805143852-517ff267f8d1
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190805144654-3d5bf3a310c1
-	k8s.io/metrics => k8s.io/metrics v0.0.0-20190805143318-16b07057415d
-	k8s.io/node-api => k8s.io/node-api v0.0.0-20190805144819-9dd62e4d5327
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190805142637-3b65bc4bb24f
-	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20190805143616-1485e5142db3
-	k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20190805142825-b16fad786282
+	k8s.io/api => k8s.io/api v0.17.3
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.3
+	k8s.io/apimachinery => k8s.io/apimachinery v0.17.4-beta.0
+	k8s.io/apiserver => k8s.io/apiserver v0.17.3
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.17.3
+	k8s.io/client-go => k8s.io/client-go v0.17.3
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.3
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.3
+	k8s.io/code-generator => k8s.io/code-generator v0.17.4-beta.0
+	k8s.io/component-base => k8s.io/component-base v0.17.3
+	k8s.io/cri-api => k8s.io/cri-api v0.17.4-beta.0
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.17.3
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.3
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.3
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.17.3
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.17.3
+	k8s.io/kubectl => k8s.io/kubectl v0.17.3
+	k8s.io/kubelet => k8s.io/kubelet v0.17.3
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.17.3
+	k8s.io/metrics => k8s.io/metrics v0.17.3
+	k8s.io/node-api => k8s.io/node-api v0.17.3
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.17.3
+	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.17.3
+	k8s.io/sample-controller => k8s.io/sample-controller v0.17.3
 )
 
 go 1.13