From 503082cf1a30c0f8bf8086707b8a0e536e536c7c Mon Sep 17 00:00:00 2001
From: Rafia Sabih <rafia.sabih@zalando.de>
Date: Thu, 3 Sep 2020 09:32:48 +0200
Subject: [PATCH] fix for labels selector

---
 pkg/cluster/k8sres.go      | 8 +++-----
 pkg/cluster/k8sres_test.go | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go
index 65e6910f1..39b3b182f 100644
--- a/pkg/cluster/k8sres.go
+++ b/pkg/cluster/k8sres.go
@@ -2323,11 +2323,9 @@ func (c *Cluster) generateConnectionPoolerService(spec *acidv1.PostgresSpec, rol
 		},
 		Type: v1.ServiceTypeClusterIP,
 	}
-	if role == Replica {
-		serviceSpec.Selector = c.roleLabelsSet(false, Replica)
-	} else {
-		serviceSpec.Selector = map[string]string{"connection-pooler": name}
-	}
+
+	serviceSpec.Selector = map[string]string{"connection-pooler": name}
+
 	service := &v1.Service{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:        name,
diff --git a/pkg/cluster/k8sres_test.go b/pkg/cluster/k8sres_test.go
index cce38007c..40ad99768 100644
--- a/pkg/cluster/k8sres_test.go
+++ b/pkg/cluster/k8sres_test.go
@@ -962,7 +962,7 @@ func testLabels(cluster *Cluster, podSpec *v1.PodTemplateSpec) error {
 
 	if poolerLabels != cluster.connectionPoolerLabelsSelector(Master).MatchLabels["connection-pooler"] {
 		return fmt.Errorf("Pod labels do not match, got %+v, expected %+v",
-			podSpec.ObjectMeta.Labels, cluster.connectionPoolerLabelsSelector().MatchLabels)
+			podSpec.ObjectMeta.Labels, cluster.connectionPoolerLabelsSelector(Master).MatchLabels)
 	}
 
 	return nil