fix pgpool pod label to be unique (#806)

Author: Jeff McCormick

ansible/roles/pgo-operator/files/pgo-configs/pgpool-template.json

@@ -6,7 +6,7 @@
         "labels": {
             "name": "{{.Name}}",
             "pg-cluster": "{{.ClusterName}}",
-            "crunchy-pgpool": "true",
+            "crunchy-pgpool-pod": "true",
             "service-name": "{{.Name}}",
 	    "vendor": "crunchydata"
         }
@@ -17,7 +17,7 @@
 		"matchLabels": {
             		"name": "{{.Name}}",
             		"pg-cluster": "{{.ClusterName}}",
-            		"crunchy-pgpool": "true",
+            		"crunchy-pgpool-pod": "true",
             		"service-name": "{{.Name}}",
 	    		"vendor": "crunchydata"
 		}
@@ -27,7 +27,7 @@
                 "labels": {
                     "name": "{{.Name}}",
                     "pg-cluster": "{{.ClusterName}}",
-                    "crunchy-pgpool": "true",
+                    "crunchy-pgpool-pod": "true",
                     "service-name": "{{.Name}}",
 	    	    "vendor": "crunchydata"
                 }

conf/postgres-operator/pgpool-template.json

@@ -6,7 +6,7 @@
         "labels": {
             "name": "{{.Name}}",
             "pg-cluster": "{{.ClusterName}}",
-            "crunchy-pgpool": "true",
+            "crunchy-pgpool-pod": "true",
             "service-name": "{{.Name}}",
 	    "vendor": "crunchydata"
         }
@@ -17,7 +17,7 @@
 		"matchLabels": {
             		"name": "{{.Name}}",
             		"pg-cluster": "{{.ClusterName}}",
-            		"crunchy-pgpool": "true",
+            		"crunchy-pgpool-pod": "true",
             		"service-name": "{{.Name}}",
 	    		"vendor": "crunchydata"
 		}
@@ -27,7 +27,7 @@
                 "labels": {
                     "name": "{{.Name}}",
                     "pg-cluster": "{{.ClusterName}}",
-                    "crunchy-pgpool": "true",
+                    "crunchy-pgpool-pod": "true",
                     "service-name": "{{.Name}}",
 	    	    "vendor": "crunchydata"
                 }

config/labels.go

@@ -110,6 +110,7 @@ const LABEL_USERNAME = "username"
 const LABEL_PASSWORD = "password"
 
 const LABEL_PGPOOL = "crunchy-pgpool"
+const LABEL_PGPOOL_POD = "crunchy-pgpool-pod"
 const LABEL_PGPOOL_SECRET = "pgpool-secret"
 const LABEL_PGPOOL_TASK_ADD = "pgpool-add"
 const LABEL_PGPOOL_TASK_DELETE = "pgpool-delete"

controller/podcontroller.go

@@ -315,7 +315,7 @@ func isPostgresPod(newpod *apiv1.Pod) bool {
 		log.Debugf("pgo-backrest-repo pod found [%s]", newpod.Name)
 		return false
 	}
-	if newpod.ObjectMeta.Labels[config.LABEL_PGPOOL] == "true" {
+	if newpod.ObjectMeta.Labels[config.LABEL_PGPOOL_POD] == "true" {
 		log.Debugf("pgpool pod found [%s]", newpod.Name)
 		return false
 	}