diff --git a/.golangci.yml b/.golangci.yml index 4ffc1915a..8fa65e609 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -2,4 +2,4 @@ service: prepare: - - make deps + - make GO111MODULE=on deps diff --git a/.travis.yml b/.travis.yml index 9740b43c8..90e8ed086 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,11 +11,10 @@ go: - "1.12.x" before_install: - - go get github.com/Masterminds/glide - go get github.com/mattn/goveralls install: - - make deps + - make GO111MODULE=on deps script: - hack/verify-codegen.sh diff --git a/Makefile b/Makefile index 89ecf853d..fa32eb7f9 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,6 @@ scm-source.json: .git tools: @go get -u honnef.co/go/tools/cmd/staticcheck - @go get -u github.com/Masterminds/glide fmt: @gofmt -l -w -s $(DIRS) @@ -89,7 +88,7 @@ vet: @staticcheck $(PKG) deps: - @glide install --strip-vendor + @go mod vendor test: hack/verify-codegen.sh diff --git a/delivery.yaml b/delivery.yaml index 56a6f49a9..24aa9f050 100644 --- a/delivery.yaml +++ b/delivery.yaml @@ -2,9 +2,6 @@ version: "2017-09-20" pipeline: - id: build-postgres-operator type: script - env: - GOPATH: /root/go - OPERATOR_TOP_DIR: /root/go/src/github.com/zalando commands: - desc: 'Update' cmd: | @@ -20,10 +17,6 @@ pipeline: mv go /usr/local ln -s /usr/local/go/bin/go /usr/bin/go go version - - desc: 'Symlink sources into the GOPATH' - cmd: | - mkdir -p $OPERATOR_TOP_DIR - ln -s $(pwd) $OPERATOR_TOP_DIR/postgres-operator - desc: 'Build docker image' cmd: | export PATH=$PATH:$HOME/go/bin @@ -35,15 +28,14 @@ pipeline: IMAGE=registry-write.opensource.zalan.do/acid/postgres-operator-test fi export IMAGE + export GO111MODULE=on make tools deps docker - desc: 'Run unit tests' cmd: | export PATH=$PATH:$HOME/go/bin - cd $OPERATOR_TOP_DIR/postgres-operator go test ./pkg/... - desc: 'Run e2e tests' cmd: | - cd $OPERATOR_TOP_DIR/postgres-operator make e2e - desc: 'Push docker image' cmd: | diff --git a/go.mod b/go.mod new file mode 100644 index 000000000..2c60adb10 --- /dev/null +++ b/go.mod @@ -0,0 +1,43 @@ +module github.com/zalando/postgres-operator + +require ( + github.com/aws/aws-sdk-go v1.17.4 + github.com/davecgh/go-spew v1.1.1 + github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 + github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680 + github.com/gogo/protobuf v0.0.0-20170330071051-c0656edd0d9e + github.com/golang/glog v0.0.0-20141105023935-44145f04b68c + github.com/golang/protobuf v1.1.0 + github.com/google/btree v0.0.0-20160524151835-7d79101e329e + github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367 + github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d + github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7 + github.com/hashicorp/golang-lru v0.0.0-20160207214719-a0d98a5f2880 + github.com/imdario/mergo v0.0.0-20141206190957-6633656539c1 + github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af + github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3 + github.com/konsorten/go-windows-terminal-sequences v1.0.1 + github.com/kr/text v0.1.0 + github.com/lib/pq v0.0.0-20180523175426-90697d60dd84 + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd + github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da + github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 + github.com/motomux/pretty v0.0.0-20161209205251-b2aad2c9a95d + github.com/peterbourgon/diskv v2.0.1+incompatible + github.com/sirupsen/logrus v1.3.0 + github.com/spf13/pflag v1.0.1 + golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 + golang.org/x/net v0.0.0-20170809000501-1c05540f6879 + golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 + golang.org/x/text v0.0.0-20170810154203-b19bf474d317 + golang.org/x/time v0.0.0-20161028155119-f51c12702a4d + gopkg.in/inf.v0 v0.9.0 + gopkg.in/yaml.v2 v2.2.1 + k8s.io/api v0.0.0-20180712090710-2d6f90ab1293 + k8s.io/apiextensions-apiserver v0.0.0-20180808065822-cc9cd5d998df + k8s.io/apimachinery v0.0.0-20180621070125-103fd098999d + k8s.io/client-go v0.0.0-20180806134042-1f13a808da65 + k8s.io/code-generator v0.0.0-20180621065459-6702109cc68e + k8s.io/gengo v0.0.0-20180718083919-906d99f89cd6 + k8s.io/kube-openapi v0.0.0-20180620173706-91cfa479c814 +) diff --git a/go.sum b/go.sum new file mode 100644 index 000000000..fe3716832 --- /dev/null +++ b/go.sum @@ -0,0 +1,47 @@ +github.com/aws/aws-sdk-go v1.17.4/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/davecgh/go-spew v0.0.0-20170626231645-782f4967f2dc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= +github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gogo/protobuf v0.0.0-20170330071051-c0656edd0d9e/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/golang/glog v0.0.0-20141105023935-44145f04b68c/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= +github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/hashicorp/golang-lru v0.0.0-20160207214719-a0d98a5f2880/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/imdario/mergo v0.0.0-20141206190957-6633656539c1/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/lib/pq v0.0.0-20180523175426-90697d60dd84/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= +github.com/motomux/pretty v0.0.0-20161209205251-b2aad2c9a95d/go.mod h1:u3hJ0kqCQu/cPpsu3RbCOPZ0d7V3IjPjv1adNRleM9I= +github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +golang.org/x/crypto v0.0.0-20180222182404-49796115aa4b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/net v0.0.0-20170809000501-1c05540f6879/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/sys v0.0.0-20171031081856-95c657629925/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/text v0.0.0-20170810154203-b19bf474d317/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +k8s.io/api v0.0.0-20180712090710-2d6f90ab1293/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= +k8s.io/apiextensions-apiserver v0.0.0-20180808065822-cc9cd5d998df/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE= +k8s.io/apimachinery v0.0.0-20180621070125-103fd098999d/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= +k8s.io/client-go v0.0.0-20180806134042-1f13a808da65/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= +k8s.io/code-generator v0.0.0-20180621065459-6702109cc68e/go.mod h1:MYiN+ZJZ9HkETbgVZdWw2AsuAi9PZ4V80cwfuf2axe8= +k8s.io/gengo v0.0.0-20180718083919-906d99f89cd6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/kube-openapi v0.0.0-20180620173706-91cfa479c814/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=