Updates operator to set service ports as env vars.

Currently pgbadger and postgres-exporter service ports are used
to create the service but not passed into the container. This
update changes the deployment json files so that the service ports
are set in the environment of the container. The ports defined in
the pgo-config are passed into the deployment templates and used
to create the containers.

Author: jmckulk

ansible/roles/pgo-operator/files/pgo-configs/collect.json

@@ -2,7 +2,7 @@
     "name": "collect",
     "image": "{{.CCPImagePrefix}}/crunchy-collect:{{.CCPImageTag}}",
     "ports": [{
-        "containerPort": 9187,
+        "containerPort": {{.ExporterPort}},
         "protocol": "TCP"
     }],
     "env": [
@@ -25,6 +25,10 @@
         {
             "name": "JOB_NAME",
             "value": "{{.JobName}}"
+        },
+        {
+            "name": "POSTGRES_EXPORTER_PORT",
+            "value": "{{.ExporterPort}}"
         }
     ],
     "volumeMounts": [

ansible/roles/pgo-operator/files/pgo-configs/pgbadger.json

@@ -1,23 +1,26 @@
             ,{
                 "name": "pgbadger",
-		"image": "{{.CCPImagePrefix}}/crunchy-pgbadger:{{.CCPImageTag}}",
+		        "image": "{{.CCPImagePrefix}}/crunchy-pgbadger:{{.CCPImageTag}}",
                 "ports": [ {
-                        "containerPort": 10000,
+                        "containerPort": {{.PGBadgerPort}},
                         "protocol": "TCP"
                     }
                 ],
                 "readinessProbe": {
                     "tcpSocket": {
-                        "port": 10000
+                        "port": {{.PGBadgerPort}}
                     },
                     "initialDelaySeconds": 20,
                     "periodSeconds": 10
                 },
-		{{.ContainerResources }}
+		        {{.ContainerResources }}
                 "env": [ {
-		"name": "BADGER_TARGET",
-		"value": "{{.BadgerTarget}}"
-		} ],
+		            "name": "BADGER_TARGET",
+		            "value": "{{.BadgerTarget}}"
+		        },{
+                    "name": "PGBADGER_SERVICE_PORT",
+                    "value": "{{.PGBadgerPort}}"
+                } ],
                 "volumeMounts": [
                     {
                         "mountPath": "/pgdata",

conf/postgres-operator/collect.json

@@ -2,7 +2,7 @@
     "name": "collect",
     "image": "{{.CCPImagePrefix}}/crunchy-collect:{{.CCPImageTag}}",
     "ports": [{
-        "containerPort": 9187,
+        "containerPort": {{.ExporterPort}},
         "protocol": "TCP"
     }],
     "env": [
@@ -25,6 +25,9 @@
         {
             "name": "JOB_NAME",
             "value": "{{.JobName}}"
+        },{
+            "name": "POSTGRES_EXPORTER_PORT",
+            "value": "{{.ExporterPort}}"
         }
     ],
     "volumeMounts": [

conf/postgres-operator/pgbadger.json

@@ -1,23 +1,26 @@
             ,{
                 "name": "pgbadger",
-		"image": "{{.CCPImagePrefix}}/crunchy-pgbadger:{{.CCPImageTag}}",
+		        "image": "{{.CCPImagePrefix}}/crunchy-pgbadger:{{.CCPImageTag}}",
                 "ports": [ {
-                        "containerPort": 10000,
+                        "containerPort": {{.PGBadgerPort}},
                         "protocol": "TCP"
                     }
                 ],
                 "readinessProbe": {
                     "tcpSocket": {
-                        "port": 10000
+                        "port": {{.PGBadgerPort}}
                     },
                     "initialDelaySeconds": 20,
                     "periodSeconds": 10
                 },
-		{{.ContainerResources }}
+		         {{.ContainerResources }}
                 "env": [ {
-		"name": "BADGER_TARGET",
-		"value": "{{.BadgerTarget}}"
-		} ],
+		            "name": "BADGER_TARGET",
+		            "value": "{{.BadgerTarget}}"
+		        }, {
+                    "name": "PGBADGER_SERVICE_PORT",
+                    "value": "{{.PGBadgerPort}}"
+                } ],
                 "volumeMounts": [
                     {
                         "mountPath": "/pgdata",

operator/clusterutilities.go

@@ -50,13 +50,15 @@ type collectTemplateFields struct {
 	CCPImageTag     string
 	CCPImagePrefix  string
 	PgPort          string
+	ExporterPort    string
 }
 
 //consolidate
 type badgerTemplateFields struct {
 	CCPImageTag        string
 	CCPImagePrefix     string
 	BadgerTarget       string
+	PGBadgerPort       string
 	ContainerResources string
 }
 
@@ -158,6 +160,7 @@ func GetBadgerAddon(clientset *kubernetes.Clientset, namespace string, cluster *
 		badgerTemplateFields := badgerTemplateFields{}
 		badgerTemplateFields.CCPImageTag = spec.CCPImageTag
 		badgerTemplateFields.BadgerTarget = pgbadger_target
+		badgerTemplateFields.PGBadgerPort = spec.PGBadgerPort
 		badgerTemplateFields.CCPImagePrefix = Pgo.Cluster.CCPImagePrefix
 		badgerTemplateFields.ContainerResources = ""
 
@@ -199,6 +202,7 @@ func GetCollectAddon(clientset *kubernetes.Clientset, namespace string, spec *cr
 		collectTemplateFields.Name = spec.Name
 		collectTemplateFields.JobName = spec.Name
 		collectTemplateFields.CCPImageTag = spec.CCPImageTag
+		collectTemplateFields.ExporterPort = spec.ExporterPort
 		collectTemplateFields.CCPImagePrefix = Pgo.Cluster.CCPImagePrefix
 		collectTemplateFields.PgPort = spec.Port