Add pooler for replica

manifests/complete-postgres-manifest.yaml

@@ -1,7 +1,7 @@
 apiVersion: "acid.zalan.do/v1"
 kind: postgresql
 metadata:
-  name: acid-test-cluster
+  name: acid-test-cluster2
 #  labels:
 #    environment: demo
 #  annotations:
@@ -18,7 +18,8 @@ spec:
     - createdb
   enableMasterLoadBalancer: false
   enableReplicaLoadBalancer: false
-#  enableConnectionPooler: true  # not needed when connectionPooler section is present (see below)
+  #enableConnectionPooler: true  # not needed when connectionPooler section is present (see below)
+  enableReplicaConnectionPooler: true # set to enable connectionPooler for replica endpoints
   allowedSourceRanges:  # load balancers' source ranges for both master and replica services
   - 127.0.0.1/32
   databases:

pkg/apis/acid.zalan.do/v1/crds.go

@@ -262,6 +262,9 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 					"enableConnectionPooler": {
 						Type: "boolean",
 					},
+					"enableReplicaConnectionPooler": {
+						Type: "boolean",
+					},
 					"enableLogicalBackup": {
 						Type: "boolean",
 					},

pkg/apis/acid.zalan.do/v1/postgresql_type.go

@@ -30,6 +30,7 @@ type PostgresSpec struct {
 	Resources       `json:"resources,omitempty"`
 
 	EnableConnectionPooler        *bool             `json:"enableConnectionPooler,omitempty"`
+	EnableReplicaConnectionPooler *bool             `json:"enableReplicaConnectionPooler,omitempty"`
 	ConnectionPooler              *ConnectionPooler `json:"connectionPooler,omitempty"`
 
 	TeamID      string `json:"teamId"`

pkg/cluster/k8sres.go

@@ -2085,9 +2085,13 @@ func (c *Cluster) getConnectionPoolerEnvVars(spec *acidv1.PostgresSpec) []v1.Env
 
 	return []v1.EnvVar{
 		{
-			Name:  "CONNECTION_POOLER_PORT",
+			Name:  "CONNECTION_POOLER_MASTER_PORT",
 			Value: fmt.Sprint(pgPort),
 		},
+		{
+			Name:  "CONNECTION_POOLER_REPLICA_PORT",
+			Value: fmt.Sprint(5433),
+		},
 		{
 			Name:  "CONNECTION_POOLER_MODE",
 			Value: effectiveMode,
@@ -2304,8 +2308,10 @@ func (c *Cluster) generateConnectionPoolerService(spec *acidv1.PostgresSpec) *v1
 	if spec.ConnectionPooler == nil {
 		spec.ConnectionPooler = &acidv1.ConnectionPooler{}
 	}
+	var serviceSpec = v1.ServiceSpec{}
 
-	serviceSpec := v1.ServiceSpec{
+	if *spec.EnableReplicaConnectionPooler == false {
+		serviceSpec = v1.ServiceSpec{
 			Ports: []v1.ServicePort{
 				{
 					Name:       c.connectionPoolerName(),
@@ -2318,6 +2324,26 @@ func (c *Cluster) generateConnectionPoolerService(spec *acidv1.PostgresSpec) *v1
 				"connection-pooler": c.connectionPoolerName(),
 			},
 		}
+	} else {
+		serviceSpec = v1.ServiceSpec{
+			Ports: []v1.ServicePort{
+				{
+					Name:       c.connectionPoolerName(),
+					Port:       pgPort,
+					TargetPort: intstr.IntOrString{StrVal: c.servicePort(Master)},
+				},
+				{
+					Name:       c.connectionPoolerName() + "-repl",
+					Port:       5433,
+					TargetPort: intstr.IntOrString{StrVal: c.servicePort(Replica)},
+				},
+			},
+			Type: v1.ServiceTypeClusterIP,
+			Selector: map[string]string{
+				"connection-pooler": c.connectionPoolerName(),
+			},
+		}
+	}
 
 	service := &v1.Service{
 		ObjectMeta: metav1.ObjectMeta{