From 9b630cf2bfe9cf2a79c8090cf83d712eafbc306d Mon Sep 17 00:00:00 2001
From: aperigault <aperigault@users.noreply.github.com>
Date: Mon, 27 Jul 2020 19:56:17 +0200
Subject: [PATCH] prometheus-cloudwatch-exporter: Add containerPort,
 livenessProbe.path and readinessProbe.path variables (#22923)

Signed-off-by: Antony Perigault <antony.perigault@polyconseil.fr>
---
 stable/prometheus-cloudwatch-exporter/Chart.yaml       |  2 +-
 stable/prometheus-cloudwatch-exporter/README.md        |  1 +
 .../templates/deployment.yaml                          | 10 +++++-----
 stable/prometheus-cloudwatch-exporter/values.yaml      |  4 ++++
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/stable/prometheus-cloudwatch-exporter/Chart.yaml b/stable/prometheus-cloudwatch-exporter/Chart.yaml
index f9cb6b9234..5cd05ab0b9 100644
--- a/stable/prometheus-cloudwatch-exporter/Chart.yaml
+++ b/stable/prometheus-cloudwatch-exporter/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "0.8.0"
 description: A Helm chart for prometheus cloudwatch-exporter
 name: prometheus-cloudwatch-exporter
-version: 0.8.2
+version: 0.8.3
 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 ca94d26b3d..466ca376eb 100644
--- a/stable/prometheus-cloudwatch-exporter/README.md
+++ b/stable/prometheus-cloudwatch-exporter/README.md
@@ -55,6 +55,7 @@ The following table lists the configurable parameters of the Cloudwatch Exporter
 | `image.tag`                       | Image tag                                                               | `cloudwatch_exporter-0.8.0` |
 | `image.pullPolicy`                | Image pull policy                                                       | `IfNotPresent`              |
 | `command`                         | Container entrypoint command                                            | `[]`                        |
+| `containerPort`                   | Application listening port                                              | `9106`                      |
 | `service.type`                    | Service type                                                            | `ClusterIP`                 |
 | `service.port`                    | The service port                                                        | `80`                        |
 | `service.portName`                | The name of the service port                                            | `http`                      |
diff --git a/stable/prometheus-cloudwatch-exporter/templates/deployment.yaml b/stable/prometheus-cloudwatch-exporter/templates/deployment.yaml
index 77da4b51d5..1d394e329a 100644
--- a/stable/prometheus-cloudwatch-exporter/templates/deployment.yaml
+++ b/stable/prometheus-cloudwatch-exporter/templates/deployment.yaml
@@ -66,22 +66,22 @@ spec:
           {{- end }}
           ports:
             - name: container-port
-              containerPort: 9106
+              containerPort: {{ .Values.containerPort }}
               protocol: TCP
           livenessProbe:
             httpGet:
-              path: /-/healthy
+              path: {{ .Values.livenessProbe.path }}
               port: container-port
-            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds}}
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
             successThreshold: {{ .Values.livenessProbe.successThreshold }}
             failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
           readinessProbe:
             httpGet:
-              path: /-/ready
+              path: {{ .Values.readinessProbe.path }}
               port: container-port
-            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds}}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
             successThreshold: {{ .Values.readinessProbe.successThreshold }}
diff --git a/stable/prometheus-cloudwatch-exporter/values.yaml b/stable/prometheus-cloudwatch-exporter/values.yaml
index c4da6cb3e0..2b10317e78 100644
--- a/stable/prometheus-cloudwatch-exporter/values.yaml
+++ b/stable/prometheus-cloudwatch-exporter/values.yaml
@@ -23,6 +23,8 @@ image:
 
 command: []
 
+containerPort: 9106
+
 service:
   type: ClusterIP
   port: 9106
@@ -113,6 +115,7 @@ affinity: {}
 
 # Configurable health checks against the /healthy and /ready endpoints
 livenessProbe:
+  path: /-/healthy
   initialDelaySeconds: 30
   periodSeconds: 5
   timeoutSeconds: 5
@@ -120,6 +123,7 @@ livenessProbe:
   failureThreshold: 3
 
 readinessProbe:
+  path: /-/ready
   initialDelaySeconds: 30
   periodSeconds: 5
   timeoutSeconds: 5