From cca221086146da568f1f761938a8e5b1d3d9dfd2 Mon Sep 17 00:00:00 2001 From: "Jonathan S. Katz" Date: Wed, 2 Sep 2020 10:20:51 -0400 Subject: [PATCH] Add compatibility for PostgreSQL Operator 4.4.1 --- README.md | 8 +-- centos7/Dockerfile.pgo-osb.centos7 | 4 +- deploy/deploy_notls.yaml | 2 +- deploy/deployment.yaml | 2 +- go.mod | 78 +++++++++++++----------------- go.sum | 17 +++++-- 6 files changed, 54 insertions(+), 57 deletions(-) diff --git a/README.md b/README.md index 5ec9bd3..8efff0e 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@

-Latest Release: v4.4.0, 2020-08-12 +Latest Release: v4.4.1, 2020-09-02 ## General @@ -40,8 +40,8 @@ schedule and version number for the the Therefore, to ensure compatibility between **pgo-osb** and the PostgreSQL Operator, please ensure the version number for **pgo-osb** matches the version number of the PostgreSQL Operator deployed in your environment. For -instance, if you are using **pgo-osb** v4.4.0, please ensure the Crunchy -PostgreSQL Operator v4.4.0 is also deployed in your environment. +instance, if you are using **pgo-osb** v4.4.1, please ensure the Crunchy +PostgreSQL Operator v4.4.1 is also deployed in your environment. ## Prerequisites @@ -171,7 +171,7 @@ export OSB_NAMESPACE=demo export OSB_CMD=kubectl export OSB_ROOT=$GOPATH/src/github.com/crunchydata/pgo-osb export OSB_BASEOS=centos7 -export OSB_VERSION=4.4.0 +export OSB_VERSION=4.4.1 export OSB_IMAGE_TAG=$OSB_BASEOS-$OSB_VERSION export OSB_IMAGE_PREFIX=crunchydata ``` diff --git a/centos7/Dockerfile.pgo-osb.centos7 b/centos7/Dockerfile.pgo-osb.centos7 index ffb9417..fc90747 100644 --- a/centos7/Dockerfile.pgo-osb.centos7 +++ b/centos7/Dockerfile.pgo-osb.centos7 @@ -1,8 +1,8 @@ FROM centos:7 LABEL Vendor="Crunchy Data Solutions" \ - Version="4.4.0" \ - Release="4.4.0" \ + Version="4.4.1" \ + Release="4.4.1" \ summary="Crunchy Data pgo-osb open service broker " \ description="Crunchy Data PostgreSQL Operator - pgo-osb " diff --git a/deploy/deploy_notls.yaml b/deploy/deploy_notls.yaml index 51b3864..a66bfc1 100644 --- a/deploy/deploy_notls.yaml +++ b/deploy/deploy_notls.yaml @@ -38,7 +38,7 @@ spec: - --PGO_APISERVER_URL - "https://postgres-operator:8443" - --PGO_APISERVER_VERSION - - "4.4.0" + - "4.4.1" - --insecure - "true" - --logtostderr diff --git a/deploy/deployment.yaml b/deploy/deployment.yaml index 7d7469d..69ec615 100644 --- a/deploy/deployment.yaml +++ b/deploy/deployment.yaml @@ -38,7 +38,7 @@ spec: - --PGO_APISERVER_URL - "https://postgres-operator:8443" - --PGO_APISERVER_VERSION - - "4.4.0" + - "4.4.1" - --logtostderr - --tls-cert-file - "/var/run/pgo-osb/server.crt" diff --git a/go.mod b/go.mod index 948f76a..7f7a109 100644 --- a/go.mod +++ b/go.mod @@ -3,59 +3,49 @@ module github.com/crunchydata/pgo-osb go 1.13 require ( - github.com/PuerkitoBio/purell v1.1.1 - github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 - github.com/beorn7/perks v1.0.1 - github.com/crunchydata/postgres-operator v4.4.0+incompatible - github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c - github.com/emicklei/go-restful v2.10.0+incompatible - github.com/evanphx/json-patch v4.5.0+incompatible - github.com/ghodss/yaml v1.0.0 - github.com/go-openapi/jsonpointer v0.19.3 - github.com/go-openapi/jsonreference v0.19.3 - github.com/go-openapi/spec v0.19.3 - github.com/go-openapi/swag v0.19.5 + github.com/beorn7/perks v1.0.1 // indirect + github.com/blang/expenv v1.2.0 // indirect + github.com/crunchydata/postgres-operator v4.4.1+incompatible + github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect + github.com/emicklei/go-restful v2.10.0+incompatible // indirect + github.com/evanphx/json-patch v4.5.0+incompatible // indirect + github.com/ghodss/yaml v1.0.0 // indirect + github.com/go-openapi/jsonreference v0.19.3 // indirect + github.com/go-openapi/spec v0.19.3 // indirect github.com/gofrs/uuid v3.2.0+incompatible - github.com/gogo/protobuf v1.3.0 - github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b - github.com/golang/protobuf v1.3.2 - github.com/google/btree v1.0.0 - github.com/google/gofuzz v1.0.0 - github.com/googleapis/gnostic v0.3.1 - github.com/gorilla/mux v1.7.3 - github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 - github.com/howeyc/gopass v0.0.0-20190910152052-7cb4b85ec19c - github.com/imdario/mergo v0.3.8 - github.com/json-iterator/go v1.1.7 - github.com/juju/ratelimit v0.0.0-20171026090426-59fac5042749 - github.com/konsorten/go-windows-terminal-sequences v1.0.2 - github.com/kubernetes/client-go v6.0.0+incompatible - github.com/lib/pq v1.2.0 - github.com/mailru/easyjson v0.7.0 - github.com/matttproud/golang_protobuf_extensions v1.0.1 - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd - github.com/modern-go/reflect2 v1.0.1 - github.com/petar/GoLLRB v0.0.0-20190514000832-33fb24c13b99 + github.com/gogo/protobuf v1.3.0 // indirect + github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect + github.com/google/btree v1.0.0 // indirect + github.com/googleapis/gnostic v0.3.1 // indirect + github.com/gorilla/mux v1.7.3 // indirect + github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect + github.com/howeyc/gopass v0.0.0-20190910152052-7cb4b85ec19c // indirect + github.com/imdario/mergo v0.3.8 // indirect + github.com/json-iterator/go v1.1.7 // indirect + github.com/juju/ratelimit v0.0.0-20171026090426-59fac5042749 // indirect + github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect + github.com/kubernetes/client-go v6.0.0+incompatible // indirect + github.com/lib/pq v1.2.0 // indirect + github.com/mailru/easyjson v0.7.0 // indirect + github.com/petar/GoLLRB v0.0.0-20190514000832-33fb24c13b99 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect - github.com/pkg/errors v0.8.1 github.com/pmorie/go-open-service-broker-client v0.0.0-20180928143052-79b374a2302f github.com/pmorie/osb-broker-lib v0.0.0-20180423193413-f4ca270ef323 github.com/prometheus/client_golang v1.0.0 - github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 - github.com/prometheus/common v0.7.0 - github.com/prometheus/procfs v0.0.5 + github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 // indirect + github.com/prometheus/common v0.7.0 // indirect + github.com/prometheus/procfs v0.0.5 // indirect github.com/shawn-hurley/osb-broker-k8s-lib v0.0.0-20180430125558-bed19ac36ffe github.com/sirupsen/logrus v1.4.2 - github.com/spf13/pflag v1.0.5 + github.com/spf13/pflag v1.0.5 // indirect github.com/xdg/stringprep v1.0.0 // indirect - golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc - golang.org/x/net v0.0.0-20191003171128-d98b1b443823 - golang.org/x/sys v0.0.0-20191007092633-5f54ce542709 - golang.org/x/text v0.3.2 - gopkg.in/inf.v0 v0.9.1 + golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc // indirect + golang.org/x/net v0.0.0-20191003171128-d98b1b443823 // indirect + golang.org/x/sys v0.0.0-20191007092633-5f54ce542709 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.2.4 - k8s.io/api v0.0.0-20171214033149-af4bc157c3a2 + k8s.io/api v0.0.0-20171214033149-af4bc157c3a2 // indirect k8s.io/apimachinery v0.0.0-20171207040834-180eddb345a5 k8s.io/client-go v6.0.0+incompatible - k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d + k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d // indirect ) diff --git a/go.sum b/go.sum index 831d6a4..c7dc903 100644 --- a/go.sum +++ b/go.sum @@ -13,13 +13,13 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/crunchydata/postgres-operator v1.3.2 h1:hTPKWR3Gw9VFpQ+g5L1TLdv4kSQ5pVBjFpHYHgRZt5I= -github.com/crunchydata/postgres-operator v4.2.3+incompatible h1:0uPiAHt0Qv+SfL/OSS1DiHd0/M7d3HvqmPqq5o7dJ3I= -github.com/crunchydata/postgres-operator v4.2.3+incompatible/go.mod h1:oFjQzSNSrG0cUtqahIQDPO32bqCbg3hpwOMVJofNSyM= -github.com/crunchydata/postgres-operator v4.4.0+incompatible h1:CEx3g6zAdo7cfSrYnUvgHmeJ0/ExTyq1RbhxuwhJE30= -github.com/crunchydata/postgres-operator v4.4.0+incompatible/go.mod h1:oFjQzSNSrG0cUtqahIQDPO32bqCbg3hpwOMVJofNSyM= +github.com/blang/expenv v1.2.0 h1:K4ioZx3YtMZGzviMn1/3sjt9dc/TaFWPCoBfTVGZ3m4= +github.com/blang/expenv v1.2.0/go.mod h1:QaWOoKNTB+PuI3HYcVRKd964gW8OMgiVyuTQUmMKBtU= +github.com/crunchydata/postgres-operator v4.4.1+incompatible h1:eE/+/Z5tq1TaYfmy74UDEe+p/vua2LrXK1KlpnjrIiQ= +github.com/crunchydata/postgres-operator v4.4.1+incompatible/go.mod h1:oFjQzSNSrG0cUtqahIQDPO32bqCbg3hpwOMVJofNSyM= github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c h1:ZfSZ3P3BedhKGUhzj7BQlPSU4OvT6tfOKe3DVHzOA7s= github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= @@ -66,6 +66,7 @@ github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= @@ -91,11 +92,14 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kubernetes/client-go v6.0.0+incompatible h1:SwoXgvkzu9X4zhj1JekPxu2nUTzJsQ9lotEQZ+ClnFs= github.com/kubernetes/client-go v6.0.0+incompatible/go.mod h1:kszVi2i+FeqECZHhjpkV5h5zM0GnURfJv897YzgoAQ8= @@ -126,6 +130,7 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmorie/go-open-service-broker-client v0.0.0-20180928143052-79b374a2302f h1:AL4ivIEo3PAiU8a8cAye4+ZrsqmOXVMkWQddmExwBbo= github.com/pmorie/go-open-service-broker-client v0.0.0-20180928143052-79b374a2302f/go.mod h1:6d5FSWVMC68G2RoLKixGVhkoNlgoEC/phmruM0yHdjQ= @@ -159,6 +164,7 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0= github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= @@ -197,6 +203,7 @@ golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=