fix pgbouncer backrest restore bug and update to rc5 version string

Author: jmccormick2001

apiservermsgs/common.go

@@ -17,7 +17,7 @@ limitations under the License.
 
 import ()
 
-const PGO_VERSION = "3.5.2-rc4"
+const PGO_VERSION = "3.5.2-rc5"
 
 // Ok status
 const Ok = "ok"

conf/postgres-operator/pgo.yaml

@@ -92,4 +92,4 @@ Pgo:
   LSPVCTemplate:  /pgo-config/pgo.lspvc-template.json
   LoadTemplate:  /pgo-config/pgo.load-template.json
   COImagePrefix:  crunchydata
-  COImageTag:  centos7-3.5.2-rc3
+  COImageTag:  centos7-3.5.2-rc5

operator/backrest/restore.go

@@ -440,7 +440,8 @@ func CreateRestoredDeployment(restclient *rest.RESTClient, cluster *crv1.Pgclust
 		CollectAddon:            operator.GetCollectAddon(clientset, namespace, &cluster.Spec),
 		BadgerAddon:             operator.GetBadgerAddon(clientset, namespace, &cluster.Spec),
 		PgbackrestEnvVars:       operator.GetPgbackrestEnvVars(cluster.Spec.UserLabels[util.LABEL_BACKREST], cluster.Spec.Name, restoreToName, cluster.Spec.Port),
-		PgbouncerEnvVars:        operator.GetPgbouncerEnvVar(cluster.Spec.UserLabels[util.LABEL_PGBOUNCER_PASS]),
+		//PgbouncerEnvVars:        operator.GetPgbouncerEnvVar(cluster.Spec.UserLabels[util.LABEL_PGBOUNCER_PASS]),
+		PgbouncerEnvVars: "",
 	}
 
 	log.Debug("collectaddon value is [" + deploymentFields.CollectAddon + "]")