Skip to content

Commit

Permalink
switch dep to go mod and upgrade go version
Browse files Browse the repository at this point in the history
  • Loading branch information
u2takey committed Feb 12, 2020
1 parent ecbfe2b commit d8fe7ae
Show file tree
Hide file tree
Showing 10 changed files with 624 additions and 123 deletions.
54 changes: 0 additions & 54 deletions .Gopkg.toml

This file was deleted.

4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 4 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
50 changes: 0 additions & 50 deletions examples/hostpath-provisioner/Gopkg.toml

This file was deleted.

5 changes: 1 addition & 4 deletions examples/hostpath-provisioner/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand All @@ -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
16 changes: 16 additions & 0 deletions examples/hostpath-provisioner/go.mod
Original file line number Diff line number Diff line change
@@ -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
)
285 changes: 285 additions & 0 deletions examples/hostpath-provisioner/go.sum

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
module sigs.k8s.io/sig-storage-lib-external-provisioner

go 1.13

require (
github.com/miekg/dns v1.1.27
github.com/onsi/ginkgo v1.12.0 // indirect
github.com/onsi/gomega v1.9.0 // indirect
github.com/prometheus/client_golang v1.4.1
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
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
)
Loading

0 comments on commit d8fe7ae

Please sign in to comment.