The add-targeted-namespace.sh script now creates

the Service Account, Role and Role Binding required
by the 'crunchy-postgres-ha' container.

The PGHA_PRIMARY_HOST environment variable is
now properly set on any replica deployments, which
ensures the Primary pod is created and initialized prior
to the replicas.  This enables the proper orchestration
and placement of Primary and Replica pods.

The PG cluster deployments and associated services
now include the Patroni port (8009).

Author: andrewlecuyer

conf/postgres-operator/cluster-deployment.json

@@ -52,7 +52,14 @@
                     }, {
                         "name": "PGHA_USER",
                         "value": "postgres"
-                    }, {
+                    }, 
+                    {{if .IsReplica}}
+                    {
+                        "name": "PGHA_PRIMARY_HOST",
+                        "value": "{{.ClusterName}}"
+                    }, 
+                    {{ end }}
+                    {
                         "name": "PATRONI_POSTGRESQL_DATA_DIR",
                         "value": "/pgdata/{{.Name}}"
                     }, {
@@ -133,6 +140,9 @@
                     "ports": [{
                         "containerPort": 5432,
                         "protocol": "TCP"
+                    }, {
+                        "containerPort": 8009,
+                        "protocol": "TCP"
                     }],
                     "resources": {},
                     "imagePullPolicy": "IfNotPresent"

conf/postgres-operator/cluster-service.json

@@ -35,6 +35,12 @@
     "port": {{.ExporterPort}},
     "targetPort": {{.ExporterPort}},
     "nodePort": 0
+    }, {
+    "name": "patroni",
+    "protocol": "TCP",
+    "port": 8009,
+    "targetPort": 8009,
+    "nodePort": 0
     }
     ],
         "selector": {

deploy/add-targeted-namespace.sh

@@ -51,3 +51,6 @@ cat $PGOROOT/conf/postgres-operator/pgo-target-role.json | sed 's/{{.TargetNames
 cat $PGOROOT/conf/postgres-operator/pgo-target-role-binding.json | sed 's/{{.TargetNamespace}}/'"$1"'/' | sed 's/{{.OperatorNamespace}}/'"$PGO_OPERATOR_NAMESPACE"'/' | $PGO_CMD -n $1 create -f -
 cat $PGOROOT/conf/postgres-operator/pgo-backrest-role.json | sed 's/{{.TargetNamespace}}/'"$1"'/' | $PGO_CMD -n $1 create -f -
 cat $PGOROOT/conf/postgres-operator/pgo-backrest-role-binding.json | sed 's/{{.TargetNamespace}}/'"$1"'/' | $PGO_CMD -n $1 create -f -
+cat $PGOROOT/conf/postgres-operator/pgo-pg-sa.json | sed 's/{{.TargetNamespace}}/'"$1"'/' | sed 's/{{.OperatorNamespace}}/'"$PGO_OPERATOR_NAMESPACE"'/' | $PGO_CMD -n $1 create -f -
+cat $PGOROOT/conf/postgres-operator/pgo-pg-role.json | sed 's/{{.TargetNamespace}}/'"$1"'/' | $PGO_CMD -n $1 create -f -
+cat $PGOROOT/conf/postgres-operator/pgo-pg-role-binding.json | sed 's/{{.TargetNamespace}}/'"$1"'/' | $PGO_CMD -n $1 create -f -

operator/cluster/clusterlogic.go

@@ -324,6 +324,7 @@ func Scale(clientset *kubernetes.Clientset, client *rest.RESTClient, replica *cr
 	replicaDeploymentFields := operator.DeploymentTemplateFields{
 		Name:               replica.Spec.Name,
 		ClusterName:        replica.Spec.ClusterName,
+		IsReplica:          true,
 		Port:               cluster.Spec.Port,
 		CCPImagePrefix:     operator.Pgo.Cluster.CCPImagePrefix,
 		CCPImageTag:        imageTag,

operator/clusterutilities.go

@@ -125,6 +125,7 @@ type DeploymentTemplateFields struct {
 	PrimaryHost string
 	// PgBouncer deployment only
 	PgbouncerPass string
+	IsReplica     bool
 }
 
 type PostgresHaTemplateFields struct {