From 347c73a0e54cd98d3668cccbaefc8b7048a77de2 Mon Sep 17 00:00:00 2001
From: robbie-demuth <robbie.demuth@appian.com>
Date: Thu, 24 Jan 2019 09:44:54 -0500
Subject: [PATCH] Use entrypoint from Docker image and fix probe paths (#10873)

* Use entrypoint from Docker image

Signed-off-by: Robbie deMuth <robbie.demuth@appian.com>

* Update probe paths to match those set in the Java application

Signed-off-by: Robbie deMuth <robbie.demuth@appian.com>

* Update chart version

Signed-off-by: Robbie deMuth <robbie.demuth@appian.com>
---
 stable/prometheus-cloudwatch-exporter/Chart.yaml     |  2 +-
 stable/prometheus-cloudwatch-exporter/README.md      |  1 -
 .../templates/configmap.yaml                         |  4 ++--
 .../templates/deployment.yaml                        | 12 +++---------
 stable/prometheus-cloudwatch-exporter/values.yaml    |  1 -
 5 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/stable/prometheus-cloudwatch-exporter/Chart.yaml b/stable/prometheus-cloudwatch-exporter/Chart.yaml
index b0e63a976d..c882188a68 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.1
+version: 0.3.0
 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 e629eeff68..426da81968 100644
--- a/stable/prometheus-cloudwatch-exporter/README.md
+++ b/stable/prometheus-cloudwatch-exporter/README.md
@@ -51,7 +51,6 @@ The following table lists the configurable parameters of the Cloudwatch Exporter
 | `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`                 |                                                        | `{}`                       |
diff --git a/stable/prometheus-cloudwatch-exporter/templates/configmap.yaml b/stable/prometheus-cloudwatch-exporter/templates/configmap.yaml
index 023bb01ef6..459103aaee 100644
--- a/stable/prometheus-cloudwatch-exporter/templates/configmap.yaml
+++ b/stable/prometheus-cloudwatch-exporter/templates/configmap.yaml
@@ -8,5 +8,5 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data:
-  config.yaml: |
-{{ printf .Values.config | indent 4 }}
\ No newline at end of file
+  config.yml: |
+{{ printf .Values.config | indent 4 }}
diff --git a/stable/prometheus-cloudwatch-exporter/templates/deployment.yaml b/stable/prometheus-cloudwatch-exporter/templates/deployment.yaml
index 13c0a4b401..2282b1ffae 100644
--- a/stable/prometheus-cloudwatch-exporter/templates/deployment.yaml
+++ b/stable/prometheus-cloudwatch-exporter/templates/deployment.yaml
@@ -24,12 +24,6 @@ spec:
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          command:
-            - java
-            - -jar
-            - /cloudwatch_exporter.jar
-            - "{{ .Values.service.targetPort }}"
-            - /config/config.yaml
         {{- if not .Values.aws.role }}
         {{- if and .Values.aws.aws_secret_access_key .Values.aws.aws_access_key_id }}
           env:
@@ -49,11 +43,11 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: {{ .Values.service.portName }}
-              containerPort: {{ .Values.service.targetPort }}
+              containerPort: 9106
               protocol: TCP
           livenessProbe:
             httpGet:
-              path: /healthy/
+              path: /-/healthy
               port: {{ .Values.service.portName }}
             initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds}}
             periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
@@ -62,7 +56,7 @@ spec:
             failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
           readinessProbe:
             httpGet:
-              path: /ready/
+              path: /-/ready
               port: {{ .Values.service.portName }}
             initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds}}
             periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
diff --git a/stable/prometheus-cloudwatch-exporter/values.yaml b/stable/prometheus-cloudwatch-exporter/values.yaml
index c089a7d198..e26ef68762 100644
--- a/stable/prometheus-cloudwatch-exporter/values.yaml
+++ b/stable/prometheus-cloudwatch-exporter/values.yaml
@@ -12,7 +12,6 @@ image:
 service:
   type: ClusterIP
   port: 80
-  targetPort: 9100
   portName: http
   annotations: {}
   labels: {}