From df4ee0c9ad5efb725a881b8e656bfeb13b04e59f Mon Sep 17 00:00:00 2001
From: Fran <francesco.beccaria@gmail.com>
Date: Thu, 7 Jun 2018 11:57:23 +0100
Subject: [PATCH] [stable/prometheus] Update Pushgateway image tag (#5969)

* [update] default pushgateway image tag to 0.5.1

* [fix] pushgateway-deployment readinessProbe path
the readinessProbe would fail if "web.route-prefix" is set in pushgateway extraArgs

* [update] Chart version

* [fix] Bump Chart version
---
 stable/prometheus/Chart.yaml                            | 2 +-
 stable/prometheus/README.md                             | 2 +-
 stable/prometheus/templates/pushgateway-deployment.yaml | 4 ++++
 stable/prometheus/values.yaml                           | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml
index 508388b15e..9072fd47d8 100755
--- a/stable/prometheus/Chart.yaml
+++ b/stable/prometheus/Chart.yaml
@@ -1,5 +1,5 @@
 name: prometheus
-version: 6.7.1
+version: 6.7.2
 appVersion: 2.2.1
 description: Prometheus is a monitoring system and time series database.
 home: https://prometheus.io/
diff --git a/stable/prometheus/README.md b/stable/prometheus/README.md
index 5c8030f6f5..eb8d30e7e6 100644
--- a/stable/prometheus/README.md
+++ b/stable/prometheus/README.md
@@ -185,7 +185,7 @@ Parameter | Description | Default
 `pushgateway.enabled` | If true, create pushgateway | `true`
 `pushgateway.name` | pushgateway container name | `pushgateway`
 `pushgateway.image.repository` | pushgateway container image repository | `prom/pushgateway`
-`pushgateway.image.tag` | pushgateway container image tag | `v0.4.0`
+`pushgateway.image.tag` | pushgateway container image tag | `v0.5.1`
 `pushgateway.image.pullPolicy` | pushgateway container image pull policy | `IfNotPresent`
 `pushgateway.extraArgs` | Additional pushgateway container arguments | `{}`
 `pushgateway.ingress.enabled` | If true, pushgateway Ingress will be created | `false`
diff --git a/stable/prometheus/templates/pushgateway-deployment.yaml b/stable/prometheus/templates/pushgateway-deployment.yaml
index 8311d60dcf..652e4a7576 100644
--- a/stable/prometheus/templates/pushgateway-deployment.yaml
+++ b/stable/prometheus/templates/pushgateway-deployment.yaml
@@ -35,7 +35,11 @@ spec:
             - containerPort: 9091
           readinessProbe:
             httpGet:
+            {{- if (index .Values "pushgateway" "extraArgs" "web.route-prefix") }}
+              path: /{{ index .Values "pushgateway" "extraArgs" "web.route-prefix" }}/#/status
+            {{- else }}
               path: /#/status
+            {{- end }}
               port: 9091
             initialDelaySeconds: 10
             timeoutSeconds: 10
diff --git a/stable/prometheus/values.yaml b/stable/prometheus/values.yaml
index ef843bd98d..787868ae1a 100644
--- a/stable/prometheus/values.yaml
+++ b/stable/prometheus/values.yaml
@@ -640,7 +640,7 @@ pushgateway:
   ##
   image:
     repository: prom/pushgateway
-    tag: v0.4.0
+    tag: v0.5.1
     pullPolicy: IfNotPresent
 
   ## Additional pushgateway container arguments