Merge pull request #67 from u2takey/master

switch dep to go mod and upgrade go version

.travis.yml

@@ -1,10 +1,8 @@
 language: go
 go_import_path: sigs.k8s.io/sig-storage-lib-external-provisioner
 go:
-  - 1.11.1
+  - 1.13.7
 services: docker
-install:
-  - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
 script:
   - make verify
   - make test

Makefile

@@ -15,13 +15,12 @@
 all: verify test
 
 dep:
-	cp .Gopkg.toml Gopkg.toml
-	-dep init
-	dep ensure
+	go mod tidy
 
 verify: dep
-	go get -u github.com/alecthomas/gometalinter
-	gometalinter --install
+	# todo gometalinter is DEPRECATED, Use https://github.com/golangci/golangci-lint
+	GO111MODULE=off go get -u github.com/alecthomas/gometalinter
+	GO111MODULE=off gometalinter --install
 	repo-infra/verify/verify-go-src.sh -v
 	repo-infra/verify/verify-boilerplate.sh
 
@@ -30,9 +29,4 @@ test: dep
 	go test ./allocator
 
 clean:
-	rm -rf ./vendor
-	rm -rf ./Gopkg.toml
-	rm -rf ./Gopkg.lock
-	rm -rf ./examples/hostpath-provisioner/vendor
-	rm -rf ./examples/hostpath-provisioner/Gopkg.lock
 	rm -rf ./test/e2e/kubernetes

allocator/doc.go

@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package allocator // import "sigs.k8s.io/sig-storage-lib-external-provisioner/allocator"
+package allocator // import "sigs.k8s.io/sig-storage-lib-external-provisioner/v5/allocator"

controller/controller.go

@@ -52,8 +52,8 @@ import (
 	ref "k8s.io/client-go/tools/reference"
 	"k8s.io/client-go/util/workqueue"
 	glog "k8s.io/klog"
-	"sigs.k8s.io/sig-storage-lib-external-provisioner/controller/metrics"
-	"sigs.k8s.io/sig-storage-lib-external-provisioner/util"
+	"sigs.k8s.io/sig-storage-lib-external-provisioner/v5/controller/metrics"
+	"sigs.k8s.io/sig-storage-lib-external-provisioner/v5/util"
 )
 
 // annClass annotation represents the storage class associated with a resource:

controller/doc.go

@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controller // import "sigs.k8s.io/sig-storage-lib-external-provisioner/controller"
+package controller // import "sigs.k8s.io/sig-storage-lib-external-provisioner/v5/controller"

controller/metrics/doc.go

@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package metrics // import "sigs.k8s.io/sig-storage-lib-external-provisioner/controller/metrics"
+package metrics // import "sigs.k8s.io/sig-storage-lib-external-provisioner/v5/controller/metrics"

examples/hostpath-provisioner/Makefile

@@ -17,8 +17,7 @@ IMAGE?=hostpath-provisioner
 all: dep hostpath-provisioner image
 
 dep:
-	-dep init
-	dep ensure
+	go mod tidy
 
 hostpath-provisioner:
 	CGO_ENABLED=0 go build -a -ldflags '-extldflags "-static"' -o hostpath-provisioner .
@@ -27,6 +26,4 @@ image: hostpath-provisioner
 	docker build -t $(IMAGE) -f Dockerfile.scratch .
 
 clean:
-	rm -rf vendor
-	rm -rf Gopkg.lock
 	rm -rf hostpath-provisioner

examples/hostpath-provisioner/go.mod

@@ -0,0 +1,16 @@
+module sigs.k8s.io/kubernetes-sigs/sig-storage-lib-external-provisioner/examples/hostpath-provisioner
+
+go 1.13
+
+require (
+	github.com/miekg/dns v1.1.27 // indirect
+	github.com/prometheus/client_golang v1.4.1 // indirect
+	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
+	golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
+	k8s.io/api v0.17.3
+	k8s.io/apimachinery v0.17.3
+	k8s.io/client-go v0.0.0-20200131194156-19522ff28802 // release-14.0
+	k8s.io/klog v1.0.0
+	k8s.io/utils v0.0.0-20200124190032-861946025e34 // indirect
+	sigs.k8s.io/sig-storage-lib-external-provisioner v4.0.1+incompatible
+)