Skip to content

Commit

Permalink
⬆️ Upgrade Operator SDK version / Remove useless GO111MODULE=off (#402)
Browse files Browse the repository at this point in the history
Signed-off-by: Rintaro Okamura <[email protected]>
  • Loading branch information
rinx authored May 25, 2020
1 parent e0d8908 commit fb392fc
Show file tree
Hide file tree
Showing 5 changed files with 148 additions and 46 deletions.
10 changes: 5 additions & 5 deletions Makefile.d/proto.mk
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ $(GOPATH)/src/github.com/googleapis/googleapis:
$(GOPATH)/src/github.com/googleapis/googleapis

$(GOPATH)/src/google.golang.org/genproto:
$(call go-get-no-mod, google.golang.org/genproto/...)
$(call go-get, google.golang.org/genproto/...)

$(GOPATH)/bin/protoc-gen-go:
$(call go-get-no-mod, github.com/golang/protobuf/protoc-gen-go)
Expand All @@ -104,10 +104,10 @@ $(GOPATH)/bin/protoc-gen-gogoslick:
$(call go-get-no-mod, github.com/gogo/protobuf/protoc-gen-gogoslick)

$(GOPATH)/bin/protoc-gen-grpc-gateway:
$(call go-get-no-mod, github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway)
$(call go-get, github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway)

$(GOPATH)/bin/protoc-gen-swagger:
$(call go-get-no-mod, github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger)
$(call go-get, github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger)

$(GOPATH)/bin/protoc-gen-gql:
$(call go-get-no-mod, github.com/danielvladco/go-proto-gql/protoc-gen-gql)
Expand All @@ -122,10 +122,10 @@ $(GOPATH)/bin/protoc-gen-validate:
$(call go-get-no-mod, github.com/envoyproxy/protoc-gen-validate)

$(GOPATH)/bin/prototool:
$(call go-get-no-mod, github.com/uber/prototool/cmd/prototool)
$(call go-get, github.com/uber/prototool/cmd/prototool)

$(GOPATH)/bin/protoc-gen-doc:
$(call go-get-no-mod, github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc)
$(call go-get, github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc)

$(GOPATH)/bin/swagger:
$(call go-get-no-mod, github.com/go-swagger/go-swagger/cmd/swagger)
Expand Down
25 changes: 14 additions & 11 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ module github.com/vdaas/vald
go 1.14

replace (
github.com/Azure/go-autorest => github.com/Azure/go-autorest v14.1.1+incompatible
github.com/boltdb/bolt => github.com/boltdb/bolt v1.3.1
github.com/cockroachdb/errors => github.com/cockroachdb/errors v1.2.5-0.20200508151722-0daaf51d1ebe
github.com/cockroachdb/errors => github.com/cockroachdb/errors v1.2.5-0.20200521081835-9833fdfac54c
github.com/coreos/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20200425165423-262c93980547
github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible
github.com/envoyproxy/protoc-gen-validate => github.com/envoyproxy/protoc-gen-validate v0.3.0-java
github.com/go-sql-driver/mysql => github.com/go-sql-driver/mysql v1.5.1-0.20200517154853-096feaaf8e9f
github.com/gocql/gocql => github.com/gocql/gocql v0.0.0-20200515162754-0714040f3e35
github.com/go-sql-driver/mysql => github.com/go-sql-driver/mysql v1.5.1-0.20200521132419-128a6737a202
github.com/gocql/gocql => github.com/gocql/gocql v0.0.0-20200519160334-799061058e31
github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.1
github.com/gophercloud/gophercloud => github.com/gophercloud/gophercloud v0.11.0
github.com/gorilla/mux => github.com/gorilla/mux v1.7.5-0.20200517040254-948bec34b516
Expand All @@ -26,11 +27,12 @@ replace (
require (
contrib.go.opencensus.io/exporter/jaeger v0.2.0
contrib.go.opencensus.io/exporter/prometheus v0.1.0
github.com/aws/aws-sdk-go v1.31.4
github.com/cespare/xxhash/v2 v2.1.1
github.com/cockroachdb/errors v0.0.0-00010101000000-000000000000
github.com/danielvladco/go-proto-gql/pb v0.6.1
github.com/envoyproxy/protoc-gen-validate v0.1.0
github.com/go-redis/redis/v7 v7.2.0
github.com/go-redis/redis/v7 v7.3.0
github.com/go-sql-driver/mysql v1.5.0
github.com/gocql/gocql v0.0.0-20200131111108-92af2e088537
github.com/gocraft/dbr/v2 v2.7.0
Expand All @@ -39,7 +41,7 @@ require (
github.com/gorilla/mux v1.7.1
github.com/hashicorp/go-version v1.2.0
github.com/json-iterator/go v1.1.9
github.com/klauspost/compress v1.10.5
github.com/klauspost/compress v1.10.6
github.com/kpango/fastime v1.0.16
github.com/kpango/fuid v0.0.0-20190507064958-80435564606b
github.com/kpango/gache v1.2.1
Expand All @@ -53,18 +55,19 @@ require (
go.opencensus.io v0.22.3
go.uber.org/automaxprocs v1.3.0
go.uber.org/goleak v1.0.0
gocloud.dev v0.19.0
golang.org/x/mod v0.3.0 // indirect
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5
golang.org/x/tools v0.0.0-20200520220537-cf2d1e09c845 // indirect
golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375 // indirect
gonum.org/v1/hdf5 v0.0.0-20200504100616-496fefe91614
gonum.org/v1/netlib v0.0.0-20200317120129-c5a04cffd98a // indirect
gonum.org/v1/plot v0.7.0
google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587
google.golang.org/genproto v0.0.0-20200521103424-e9a78aa275b7
google.golang.org/grpc v1.29.1
gopkg.in/yaml.v2 v2.3.0
k8s.io/api v0.18.2
k8s.io/apimachinery v0.18.2
k8s.io/client-go v0.18.2
k8s.io/metrics v0.18.2
k8s.io/api v0.18.3
k8s.io/apimachinery v0.18.3
k8s.io/client-go v0.18.3
k8s.io/metrics v0.18.3
sigs.k8s.io/controller-runtime v0.0.0-00010101000000-000000000000
)
Loading

0 comments on commit fb392fc

Please sign in to comment.