update collect label logic to apply collect label to the pod which is used for the sample prometheus scrape config, also added collect ports to the deployment service by default

Author: jmccormick2001

apiserver/clusterservice/clusterimpl.go

@@ -512,14 +512,14 @@ func CreateCluster(request *msgs.CreateClusterRequest) msgs.CreateClusterRespons
 		}
 
 		//set the metrics flag with the global setting first
-		userLabelsMap["crunchy-collect"] = strconv.FormatBool(apiserver.MetricsFlag)
+		userLabelsMap["crunchy_collect"] = strconv.FormatBool(apiserver.MetricsFlag)
 		if err != nil {
 			log.Error(err)
 		}
 
 		//if metrics is chosen on the pgo command, stick it into the user labels
 		if request.MetricsFlag {
-			userLabelsMap["crunchy-collect"] = "true"
+			userLabelsMap["crunchy_collect"] = "true"
 		}
 
 		if request.PgpoolFlag {

conf/apiserver/pgo.yaml

@@ -1,6 +1,6 @@
 Cluster:
   CCPImagePrefix:  crunchydata
-  CCPImageTag:  centos7-10.3-1.8.1
+  CCPImageTag:  centos7-10.3-1.8.2
   Port:  5432
   User:  testuser
   Database:  userdb

conf/postgres-operator/cluster/1/cluster-deployment-1.json

@@ -14,7 +14,8 @@
                 "labels": {
                     "name": "{{.Name}}",
                     "primary": "true",
-                    "pg-cluster": "{{.ClusterName}}"
+                    "pg-cluster": "{{.ClusterName}}",
+            {{.OperatorLabels }}
                 }
             },
             "spec": {

conf/postgres-operator/cluster/1/cluster-service-1.json

@@ -9,12 +9,27 @@
         }
     },
     "spec": {
-        "ports": [{
+        "ports": [
+	{
+	     "name": "postgres",
             "protocol": "TCP",
             "port": {{.Port}},
             "targetPort": {{.Port}},
             "nodePort": 0
-        }],
+        }, {
+	     "name": "node-exporter",
+	"protocol": "TCP",
+	"port": 9100,
+	"targetPort": 9100,
+	"nodePort": 0
+	}, {
+	"name": "postgres-exporter",
+	"protocol": "TCP",
+	"port": 9187,
+	"targetPort": 9187,
+	"nodePort": 0
+	}
+	],
         "selector": {
             "name": "{{.Name}}"
         },

conf/postgres-operator/cluster/1/collect.json

@@ -10,6 +10,6 @@
     }],
     "env": [{
         "name": "DATA_SOURCE_NAME",
-        "value": "postgresql://primaryuser:password@127.0.0.1:5432/postgres?sslmode=disable"
+        "value": "postgresql://primaryuser:{{.PrimaryPassword}}@127.0.0.1:5432/postgres?sslmode=disable"
     }]
 },

operator/cluster/cluster_strategy_1.go

@@ -51,9 +51,10 @@ type containerResourcesTemplateFields struct {
 }
 
 type collectTemplateFields struct {
-	Name           string
-	CCPImageTag    string
-	CCPImagePrefix string
+	Name            string
+	PrimaryPassword string
+	CCPImageTag     string
+	CCPImagePrefix  string
 }
 
 // Strategy1  ...
@@ -103,8 +104,6 @@ func (r Strategy1) AddCluster(clientset *kubernetes.Clientset, client *rest.REST
 
 	primaryLabels := getPrimaryLabels(cl.Spec.Name, cl.Spec.ClusterName, false, cl.Spec.UserLabels)
 
-	log.Debug("CCPImagePrefix before create cluster " + operator.CCPImagePrefix)
-
 	//create the primary deployment
 	deploymentFields := DeploymentTemplateFields{
 		Name:               cl.Spec.Name,
@@ -468,10 +467,11 @@ func GetAffinity(nodeLabelKey, nodeLabelValue string, operator string) string {
 
 func GetCollectAddon(spec *crv1.PgclusterSpec) string {
 
-	if spec.UserLabels["crunchy-collect"] == "true" {
-		log.Debug("crunchy-collect was found as a label on cluster create")
+	if spec.UserLabels["crunchy_collect"] == "true" {
+		log.Debug("crunchy_collect was found as a label on cluster create")
 		collectTemplateFields := collectTemplateFields{}
 		collectTemplateFields.Name = spec.Name
+		collectTemplateFields.PrimaryPassword = spec.PrimaryPassword
 		collectTemplateFields.CCPImageTag = spec.CCPImageTag
 		collectTemplateFields.CCPImagePrefix = operator.CCPImagePrefix