fix pgbackrest to support a non standard Postgres port

Author: jmccormick2001

conf/postgres-operator/cluster/1/pgbackrest-env-vars.json

@@ -22,3 +22,6 @@
                         "name": "PGBACKREST_LOG_PATH",
                         "value": "/tmp"
                     }, {
+                        "name": "PGBACKREST_PG_PORT",
+                        "value": "{{.PgbackrestPGPort}}"
+                    }, {

conf/postgres-operator/cluster/1/pgo-backrest-repo-template.json

@@ -52,6 +52,9 @@
                     }, {
                         "name": "PGBACKREST_REPO_PATH",
                         "value": "{{.PgbackrestRepoPath}}"
+                    }, {
+                        "name": "PGBACKREST_PG1_PORT",
+                        "value": "{{.PgbackrestPGPort}}"
                     }, {
                         "name": "PGBACKREST_LOG_PATH",
                         "value": "/tmp"

conf/postgres-operator/pgo.yaml

@@ -4,7 +4,7 @@ Cluster:
   CCPImagePrefix:  crunchydata
   Metrics:  false
   Badger:  false
-  CCPImageTag:  centos7-11.1-2.3.0
+  CCPImageTag:  centos7-11.2-2.3.1-rc2
   Port:  5432
   User:  testuser
   Database:  userdb

operator/backrest/repo.go

@@ -40,6 +40,7 @@ type RepoDeploymentTemplateFields struct {
 	PGbackrestDBHost      string
 	PgbackrestRepoPath    string
 	PgbackrestDBPath      string
+	PgbackrestPGPort      string
 	SshdPort              int
 	PgbackrestStanza      string
 	Name                  string
@@ -95,6 +96,7 @@ func CreateRepoDeployment(clientset *kubernetes.Clientset, namespace string, clu
 		PGbackrestDBHost:      cluster.Name,
 		PgbackrestRepoPath:    "/backrestrepo/" + repoName,
 		PgbackrestDBPath:      "/pgdata/" + cluster.Name,
+		PgbackrestPGPort:      cluster.Spec.Port,
 		SshdPort:              operator.Pgo.Cluster.BackrestPort,
 		PgbackrestStanza:      "db",
 		Name:                  repoName,

operator/backrest/restore.go

@@ -434,7 +434,7 @@ func CreateRestoredDeployment(restclient *rest.RESTClient, cluster *crv1.Pgclust
 		ConfVolume:              operator.GetConfVolume(clientset, cluster, namespace),
 		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),
+		PgbackrestEnvVars:       operator.GetPgbackrestEnvVars(cluster.Spec.UserLabels[util.LABEL_BACKREST], cluster.Spec.Name, restoreToName, cluster.Spec.Port),
 	}
 
 	log.Debug("collectaddon value is [" + deploymentFields.CollectAddon + "]")

operator/cluster/cluster_strategy_1.go

@@ -128,7 +128,7 @@ func (r Strategy1) AddCluster(clientset *kubernetes.Clientset, client *rest.REST
 		ConfVolume:              operator.GetConfVolume(clientset, cl, namespace),
 		CollectAddon:            operator.GetCollectAddon(clientset, namespace, &cl.Spec),
 		BadgerAddon:             operator.GetBadgerAddon(clientset, namespace, &cl.Spec),
-		PgbackrestEnvVars:       operator.GetPgbackrestEnvVars(cl.Spec.UserLabels[util.LABEL_BACKREST], cl.Spec.Name, cl.Spec.Name),
+		PgbackrestEnvVars:       operator.GetPgbackrestEnvVars(cl.Spec.UserLabels[util.LABEL_BACKREST], cl.Spec.Name, cl.Spec.Name, cl.Spec.Port),
 		PgmonitorEnvVars:        operator.GetPgmonitorEnvVars(cl.Spec.UserLabels[util.LABEL_COLLECT]),
 	}
 
@@ -386,7 +386,7 @@ func (r Strategy1) Scale(clientset *kubernetes.Clientset, client *rest.RESTClien
 		NodeSelector:            operator.GetReplicaAffinity(cluster.Spec.UserLabels, replica.Spec.UserLabels),
 		CollectAddon:            operator.GetCollectAddon(clientset, namespace, &cluster.Spec),
 		BadgerAddon:             operator.GetBadgerAddon(clientset, namespace, &cluster.Spec),
-		PgbackrestEnvVars:       operator.GetPgbackrestEnvVars(cluster.Spec.UserLabels[util.LABEL_BACKREST], replica.Spec.ClusterName, replica.Spec.Name),
+		PgbackrestEnvVars:       operator.GetPgbackrestEnvVars(cluster.Spec.UserLabels[util.LABEL_BACKREST], replica.Spec.ClusterName, replica.Spec.Name, cluster.Spec.Port),
 		PgmonitorEnvVars:        operator.GetPgmonitorEnvVars(cluster.Spec.UserLabels[util.LABEL_COLLECT]),
 	}
 

operator/clusterutilities.go

@@ -58,6 +58,7 @@ type PgbackrestEnvVarsTemplateFields struct {
 	PgbackrestDBPath    string
 	PgbackrestRepo1Path string
 	PgbackrestRepo1Host string
+	PgbackrestPGPort    string
 }
 
 type PgmonitorEnvVarsTemplateFields struct {
@@ -105,13 +106,14 @@ type DeploymentTemplateFields struct {
 }
 
 //consolidate with cluster.GetPgbackrestEnvVars
-func GetPgbackrestEnvVars(backrestEnabled, clusterName, depName string) string {
+func GetPgbackrestEnvVars(backrestEnabled, clusterName, depName, port string) string {
 	if backrestEnabled == "true" {
 		fields := PgbackrestEnvVarsTemplateFields{
 			PgbackrestStanza:    "db",
 			PgbackrestRepo1Host: clusterName + "-backrest-shared-repo",
 			PgbackrestRepo1Path: "/backrestrepo/" + clusterName + "-backrest-shared-repo",
 			PgbackrestDBPath:    "/pgdata/" + depName,
+			PgbackrestPGPort:    port,
 		}
 
 		var doc bytes.Buffer