Only expose Service ports that are used for a PostgreSQL instance

The Service template would check for the presence of optional ports
(e.g. pgBadger, collect) and expose those. However, this check is
performed by seeing if the value of the pgBadger / collect port is
present. The pgcluster CRD sets these values by default and, as such,
would always expose the port regardless if pgBadger/collect were
enabled.

This adjusts the logic to only include the value of the collect/pgBadger
port in the Service template if collect/pgBadger are actually enabled
on the CR entry.

Issue: #1611

Author: jkatz

operator/cluster/clusterlogic.go

@@ -52,15 +52,33 @@ func AddCluster(clientset *kubernetes.Clientset, client *rest.RESTClient, cl *cr
 		st = cl.Spec.UserLabels[config.LABEL_SERVICE_TYPE]
 	}
 
-	//create the primary service
+	// create the primary service
 	serviceFields := ServiceTemplateFields{
-		Name:         cl.Spec.Name,
-		ServiceName:  cl.Spec.Name,
-		ClusterName:  cl.Spec.Name,
-		Port:         cl.Spec.Port,
-		PGBadgerPort: cl.Spec.PGBadgerPort,
-		ExporterPort: cl.Spec.ExporterPort,
-		ServiceType:  st,
+		Name:        cl.Spec.Name,
+		ServiceName: cl.Spec.Name,
+		ClusterName: cl.Spec.Name,
+		Port:        cl.Spec.Port,
+		ServiceType: st,
+	}
+
+	// only add references to the collect / pgBadger ports
+	clusterLabels := cl.ObjectMeta.GetLabels()
+
+	if val, ok := clusterLabels[config.LABEL_BADGER]; ok && val == config.LABEL_TRUE {
+		serviceFields.PGBadgerPort = cl.Spec.PGBadgerPort
+	}
+
+	// ...due to legacy reasons, the collect label may not be available yet in the
+	// main labels. so we will check here first, and then check the user labels
+	if val, ok := clusterLabels[config.LABEL_COLLECT]; ok && val == config.LABEL_TRUE {
+		serviceFields.ExporterPort = cl.Spec.ExporterPort
+	}
+
+	// ...this condition should be targeted for removal in the future
+	if cl.Spec.UserLabels != nil {
+		if val, ok := cl.Spec.UserLabels[config.LABEL_COLLECT]; ok && val == config.LABEL_TRUE {
+			serviceFields.ExporterPort = cl.Spec.ExporterPort
+		}
 	}
 
 	err = CreateService(clientset, &serviceFields, namespace)