public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix for labels selector

This commit is contained in:
Rafia Sabih 2020-09-03 09:32:48 +02:00
parent a9248b1379
commit 503082cf1a
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/cluster/k8sres.go
View File

@ -2323,11 +2323,9 @@ func (c *Cluster) generateConnectionPoolerService(spec *acidv1.PostgresSpec, rol
}, },
Type: v1.ServiceTypeClusterIP, Type: v1.ServiceTypeClusterIP,
} }
if role == Replica {
serviceSpec.Selector = c.roleLabelsSet(false, Replica) serviceSpec.Selector = map[string]string{"connection-pooler": name}
} else {
serviceSpec.Selector = map[string]string{"connection-pooler": name}
}
service := &v1.Service{ service := &v1.Service{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: name, Name: name,

2
pkg/cluster/k8sres_test.go
View File

@ -962,7 +962,7 @@ func testLabels(cluster *Cluster, podSpec *v1.PodTemplateSpec) error {
if poolerLabels != cluster.connectionPoolerLabelsSelector(Master).MatchLabels["connection-pooler"] { if poolerLabels != cluster.connectionPoolerLabelsSelector(Master).MatchLabels["connection-pooler"] {
return fmt.Errorf("Pod labels do not match, got %+v, expected %+v", 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 return nil