Updated "postgres-operator" Dependency (3.5.1) & PGO-OSB Version Numb…

…er (1.2.2) (#15)

* Updated PGO dependency to v3.5.1 and updated PGO-OSB version numbers
to v1.2.2

* Update PGO API calls due to changes recently added to PGO for
multi-namespace support

Gopkg.toml

@@ -47,7 +47,7 @@
 
 [[constraint]]
   name = "github.com/crunchydata/postgres-operator"
-  version = "3.5.0"
+  version = "3.5.1"
 
 [[override]]
   name = "github.com/spf13/cobra"

README.adoc

@@ -1,6 +1,6 @@
 image::crunchy_logo.png[Crunchy Data Logo]
 
-Latest Release: v1.2.1, {docdate}
+Latest Release: v1.2.2, {docdate}
 
 == General
 
@@ -30,6 +30,7 @@ See the following:
 
 == Compatibility
 
+ * pgo-osb 1.2.2 works with Postgres Operator 3.5.1
  * pgo-osb 1.2.1 works with Postgres Operator 3.5.0
  * pgo-osb 1.2.0 works with Postgres Operator 3.4.0
  * pgo-osb 1.1.0 works with Postgres Operator 3.3.0

centos7/Dockerfile.pgo-osb.centos7

@@ -1,8 +1,8 @@
 FROM centos:7
 
 LABEL Vendor="Crunchy Data Solutions" \
-        Version="1.2.1" \
-        Release="1.2.1" \
+        Version="1.2.2" \
+        Release="1.2.2" \
         summary="Crunchy Data pgo-osb open service broker " \
         description="Crunchy Data PostgreSQL Operator - pgo-osb "
 

deploy/deployment.yaml

@@ -38,7 +38,7 @@ spec:
         - --CO_APISERVER_URL
         - "https://postgres-operator:8443"
         - --CO_APISERVER_VERSION
-        - "3.5.0"
+        - "3.5.1"
         - --insecure
         - "true"
         - --logtostderr

pgocmd/commands.go

@@ -20,13 +20,14 @@ import (
 	"crypto/x509"
 	"errors"
 	"fmt"
-	msgs "github.com/crunchydata/postgres-operator/apiservermsgs"
-	api "github.com/crunchydata/postgres-operator/pgo/api"
 	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
 	"strconv"
+
+	msgs "github.com/crunchydata/postgres-operator/apiservermsgs"
+	api "github.com/crunchydata/postgres-operator/pgo/api"
 )
 
 const INSTANCE_LABEL_KEY = "pgo-osb-instance"
@@ -48,7 +49,7 @@ func GetClusterCredentials(APIServerURL, basicAuthUsername, basicAuthPassword, c
 	}
 
 	ccpImageTag := ""
-	response, err := api.ShowCluster(httpclient, clusterName, selector, ccpImageTag, SessionCredentials)
+	response, err := api.ShowCluster(httpclient, clusterName, selector, ccpImageTag, SessionCredentials, "")
 
 	if response.Status.Code == msgs.Ok {
 		for _, result := range response.Results {
@@ -91,15 +92,14 @@ func DeleteCluster(APIServerURL, basicAuthUsername, basicAuthPassword, clientVer
 	clusterName := "all"
 	deleteData := false
 	deleteBackups := false
-	deleteConfigMaps := false
 	log.Print("deleting cluster " + selector + " with delete-data " + strconv.FormatBool(deleteData))
 
 	httpclient, SessionCredentials, err := GetCredentials(basicAuthUsername, basicAuthPassword, APIServerURL)
 	if err != nil {
 		return err
 	}
 
-	response, err := api.DeleteCluster(httpclient, clusterName, selector, SessionCredentials, deleteData, deleteBackups, deleteConfigMaps)
+	response, err := api.DeleteCluster(httpclient, clusterName, selector, SessionCredentials, deleteData, deleteBackups, "")
 
 	if response.Status.Code == msgs.Ok {
 		for _, result := range response.Results {
@@ -228,7 +228,7 @@ func showUser(BasicAuthUsername, BasicAuthPassword, APIServerURL, clientVersion,
 	if err != nil {
 		return userDetail
 	}
-	response, err := api.ShowUser(httpclient, clusterName, selector, expired, SessionCredentials)
+	response, err := api.ShowUser(httpclient, clusterName, selector, expired, SessionCredentials, "")
 
 	if response.Status.Code != msgs.Ok {
 		log.Println(response.Status.Msg)