Merge pull request #46 from cybertec-postgresql/test_fix

Fix for labels selector

Author: Schmaetz

pkg/cluster/connection_pooler.go

@@ -111,7 +111,12 @@ func (c *Cluster) poolerUser(spec *cpov1.PostgresSpec) string {
 
 // when listing pooler k8s objects
 func (c *Cluster) poolerLabelsSet(addExtraLabels bool) labels.Set {
-	return c.labelsSetWithType(addExtraLabels, TYPE_POOLER)
+
+	poolerLabels := c.labelsSet(addExtraLabels)
+	// TODO should be config values
+	poolerLabels["application"] = "db-connection-pooler"
+	return poolerLabels
+	//return c.labelsSetWithType(addExtraLabels, TYPE_POOLER)
 }
 
 // Return connection pooler labels selector, which should from one point of view

pkg/cluster/connection_pooler_test.go

@@ -7,13 +7,13 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
 	cpov1 "github.com/cybertec-postgresql/cybertec-pg-operator/pkg/apis/cpo.opensource.cybertec.at/v1"
 	fakecpov1 "github.com/cybertec-postgresql/cybertec-pg-operator/pkg/generated/clientset/versioned/fake"
 	"github.com/cybertec-postgresql/cybertec-pg-operator/pkg/util"
 	"github.com/cybertec-postgresql/cybertec-pg-operator/pkg/util/config"
 	"github.com/cybertec-postgresql/cybertec-pg-operator/pkg/util/constants"
 	"github.com/cybertec-postgresql/cybertec-pg-operator/pkg/util/k8sutil"
+	"github.com/stretchr/testify/assert"
 
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
@@ -65,12 +65,12 @@ func objectsAreSaved(cluster *Cluster, err error, reason SyncReason) error {
 	}
 
 	for _, role := range []PostgresRole{Master, Replica} {
-		poolerLabels := cluster.labelsSet(false)
+		poolerLabels := cluster.poolerLabelsSet(false)
 		poolerLabels["application"] = "db-connection-pooler"
 		poolerLabels["connection-pooler"] = cluster.connectionPoolerName(role)
 
 		if cluster.ConnectionPooler[role].Deployment == nil || !util.MapContains(cluster.ConnectionPooler[role].Deployment.Labels, poolerLabels) {
-			return fmt.Errorf("Deployment was not saved or labels not attached %s %s", role, cluster.ConnectionPooler[role].Deployment.Labels)
+			return fmt.Errorf("Deployment was not saved or labels not attached role = %s Labels = %s PoolerLabels=%s", role, cluster.ConnectionPooler[role].Deployment.Labels, poolerLabels)
 		}
 
 		if cluster.ConnectionPooler[role].Service == nil || !util.MapContains(cluster.ConnectionPooler[role].Service.Labels, poolerLabels) {
@@ -86,12 +86,12 @@ func MasterObjectsAreSaved(cluster *Cluster, err error, reason SyncReason) error
 		return fmt.Errorf("Connection pooler resources are empty")
 	}
 
-	poolerLabels := cluster.labelsSet(false)
+	poolerLabels := cluster.poolerLabelsSet(false)
 	poolerLabels["application"] = "db-connection-pooler"
 	poolerLabels["connection-pooler"] = cluster.connectionPoolerName(Master)
 
 	if cluster.ConnectionPooler[Master].Deployment == nil || !util.MapContains(cluster.ConnectionPooler[Master].Deployment.Labels, poolerLabels) {
-		return fmt.Errorf("Deployment was not saved or labels not attached %s", cluster.ConnectionPooler[Master].Deployment.Labels)
+		return fmt.Errorf("Deployment was not saved or labels not attached for MAster %s pooler labels are %s", cluster.ConnectionPooler[Master].Deployment.Labels, poolerLabels)
 	}
 
 	if cluster.ConnectionPooler[Master].Service == nil || !util.MapContains(cluster.ConnectionPooler[Master].Service.Labels, poolerLabels) {
@@ -106,12 +106,12 @@ func ReplicaObjectsAreSaved(cluster *Cluster, err error, reason SyncReason) erro
 		return fmt.Errorf("Connection pooler resources are empty")
 	}
 
-	poolerLabels := cluster.labelsSet(false)
+	poolerLabels := cluster.poolerLabelsSet(false)
 	poolerLabels["application"] = "db-connection-pooler"
 	poolerLabels["connection-pooler"] = cluster.connectionPoolerName(Replica)
 
 	if cluster.ConnectionPooler[Replica].Deployment == nil || !util.MapContains(cluster.ConnectionPooler[Replica].Deployment.Labels, poolerLabels) {
-		return fmt.Errorf("Deployment was not saved or labels not attached %s", cluster.ConnectionPooler[Replica].Deployment.Labels)
+		return fmt.Errorf("Deployment was not saved or labels not attached for Replica %s pooler labels are %s", cluster.ConnectionPooler[Replica].Deployment.Labels, poolerLabels)
 	}
 
 	if cluster.ConnectionPooler[Replica].Service == nil || !util.MapContains(cluster.ConnectionPooler[Replica].Service.Labels, poolerLabels) {

pkg/cluster/sync.go

@@ -1632,7 +1632,7 @@ func (c *Cluster) syncPgbackrestJob(forceRemove bool) error {
 								if err := c.createPgbackrestJob(job); err != nil {
 									return fmt.Errorf("could not create a pgbackrest cronjob: %v", err)
 								}
-								c.logger.Info("pgbackrest cronjob for %v %v has been successfully created", rep, schedul)
+								c.logger.Infof("pgbackrest cronjob for %v %v has been successfully created", rep, schedul)
 							}
 						}
 					}

pkg/cluster/util.go

@@ -557,7 +557,7 @@ func (c *Cluster) roleLabelsSet(shouldAddExtraLabels bool, role PostgresRole) la
 	var lbls labels.Set
 	// Ignore PodRoleLabel for Role ClusterPods
 	if role != ClusterPods {
-		lbls = c.labelsSetWithType(shouldAddExtraLabels, TYPE_POSTGRESQL)
+		lbls = c.labelsSet(shouldAddExtraLabels) //c.labelsSetWithType(shouldAddExtraLabels, TYPE_POSTGRESQL)
 		lbls[c.OpConfig.PodRoleLabel] = string(role)
 	} else {
 		lbls = c.labelsSetWithType(shouldAddExtraLabels, "")

pkg/cluster/volumes.go

@@ -230,7 +230,8 @@ func (c *Cluster) syncEbsVolumes() error {
 func (c *Cluster) listPersistentVolumeClaims() ([]v1.PersistentVolumeClaim, error) {
 	ns := c.Namespace
 	listOptions := metav1.ListOptions{
-		LabelSelector: c.labelsSetWithType(false, TYPE_POSTGRESQL).String(),
+		//LabelSelector: c.labelsSetWithType(false, TYPE_POSTGRESQL).String(),
+		LabelSelector: c.labelsSet(false).String(),
 	}
 
 	pvcs, err := c.KubeClient.PersistentVolumeClaims(ns).List(context.TODO(), listOptions)

pkg/cluster/volumes_test.go

@@ -14,13 +14,13 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/golang/mock/gomock"
 
-	"github.com/stretchr/testify/assert"
 	"github.com/cybertec-postgresql/cybertec-pg-operator/mocks"
 	cpov1 "github.com/cybertec-postgresql/cybertec-pg-operator/pkg/apis/cpo.opensource.cybertec.at/v1"
 	"github.com/cybertec-postgresql/cybertec-pg-operator/pkg/util/config"
 	"github.com/cybertec-postgresql/cybertec-pg-operator/pkg/util/constants"
 	"github.com/cybertec-postgresql/cybertec-pg-operator/pkg/util/k8sutil"
 	"github.com/cybertec-postgresql/cybertec-pg-operator/pkg/util/volumes"
+	"github.com/stretchr/testify/assert"
 	"k8s.io/client-go/kubernetes/fake"
 )