From 3168c19aa549932af74c3c9d729ef77791ec0726 Mon Sep 17 00:00:00 2001
From: Kevin Pullin <kevin.pullin@gmail.com>
Date: Tue, 16 Oct 2018 03:45:53 -0700
Subject: [PATCH] cloudwatch-exporter - Support custom service labels and
 portName (#8488)

Signed-off-by: Kevin Pullin <kevin.pullin@gmail.com>
---
 stable/prometheus-cloudwatch-exporter/Chart.yaml            | 2 +-
 stable/prometheus-cloudwatch-exporter/README.md             | 2 ++
 .../templates/deployment.yaml                               | 6 +++---
 .../prometheus-cloudwatch-exporter/templates/service.yaml   | 5 ++++-
 stable/prometheus-cloudwatch-exporter/values.yaml           | 2 ++
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/stable/prometheus-cloudwatch-exporter/Chart.yaml b/stable/prometheus-cloudwatch-exporter/Chart.yaml
index c9307a2983..b0e63a976d 100644
--- a/stable/prometheus-cloudwatch-exporter/Chart.yaml
+++ b/stable/prometheus-cloudwatch-exporter/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "0.5.0"
 description: A Helm chart for prometheus cloudwatch-exporter
 name: prometheus-cloudwatch-exporter
-version: 0.2.0
+version: 0.2.1
 home: https://github.com/prometheus/cloudwatch_exporter
 sources:
 - https://github.com/prometheus/cloudwatch_exporter
diff --git a/stable/prometheus-cloudwatch-exporter/README.md b/stable/prometheus-cloudwatch-exporter/README.md
index f9f9d49618..e629eeff68 100644
--- a/stable/prometheus-cloudwatch-exporter/README.md
+++ b/stable/prometheus-cloudwatch-exporter/README.md
@@ -50,8 +50,10 @@ The following table lists the configurable parameters of the Cloudwatch Exporter
 | `image.pullPolicy`          | Image pull policy                                      | `IfNotPresent`             |
 | `service.type`              | Service type                                           | `ClusterIP`                |
 | `service.port`              | The service port                                       | `80`                       |
+| `service.portName`          | The name of the service port                           | `http`                     |
 | `service.targetPort`        | The target port of the container                       | `9100`                     |
 | `service.annotations`       | Custom annotations for service                         | `{}`                       |
+| `service.labels`            | Additional custom labels for the service               | `{}`                       |
 | `resources`                 |                                                        | `{}`                       |
 | `aws.region`                | AWS Cloudwatch region                                  | `eu-west-1`                |
 | `aws.role`                  | AWS IAM Role To Use                                    |                            |
diff --git a/stable/prometheus-cloudwatch-exporter/templates/deployment.yaml b/stable/prometheus-cloudwatch-exporter/templates/deployment.yaml
index 144a0d02ac..13c0a4b401 100644
--- a/stable/prometheus-cloudwatch-exporter/templates/deployment.yaml
+++ b/stable/prometheus-cloudwatch-exporter/templates/deployment.yaml
@@ -48,13 +48,13 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
-            - name: http
+            - name: {{ .Values.service.portName }}
               containerPort: {{ .Values.service.targetPort }}
               protocol: TCP
           livenessProbe:
             httpGet:
               path: /healthy/
-              port: http
+              port: {{ .Values.service.portName }}
             initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds}}
             periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
@@ -63,7 +63,7 @@ spec:
           readinessProbe:
             httpGet:
               path: /ready/
-              port: http
+              port: {{ .Values.service.portName }}
             initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds}}
             periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
diff --git a/stable/prometheus-cloudwatch-exporter/templates/service.yaml b/stable/prometheus-cloudwatch-exporter/templates/service.yaml
index 418223fe3b..def2c9e7e4 100644
--- a/stable/prometheus-cloudwatch-exporter/templates/service.yaml
+++ b/stable/prometheus-cloudwatch-exporter/templates/service.yaml
@@ -9,13 +9,16 @@ metadata:
     chart: {{ template "prometheus-cloudwatch-exporter.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+{{- if .Values.service.labels }}
+{{ toYaml .Values.service.labels | indent 4 }}
+{{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.port }}
       targetPort: {{ .Values.service.targetPort }}
       protocol: TCP
-      name: http
+      name: {{ .Values.service.portName }}
   selector:
     app: {{ template "prometheus-cloudwatch-exporter.name" . }}
     release: {{ .Release.Name }}
diff --git a/stable/prometheus-cloudwatch-exporter/values.yaml b/stable/prometheus-cloudwatch-exporter/values.yaml
index bb986cfdf6..c089a7d198 100644
--- a/stable/prometheus-cloudwatch-exporter/values.yaml
+++ b/stable/prometheus-cloudwatch-exporter/values.yaml
@@ -13,7 +13,9 @@ service:
   type: ClusterIP
   port: 80
   targetPort: 9100
+  portName: http
   annotations: {}
+  labels: {}
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious