From 0cf32f0b56c3d9805e31cc63250c73f7c00a6ca2 Mon Sep 17 00:00:00 2001
From: Sebastian Friedel <sebastian@civist.com>
Date: Fri, 15 Dec 2017 17:44:28 +0100
Subject: [PATCH] [stable/grafana] Allow customization of readinessProbe via
 values.yaml (#2923)

* [stable/grafana] Allow customization of readinessProbe via values.yaml

* [stable/grafana] Add `server.readinessProbe` documentation to README

* [stable/grafana] Bump chart version
---
 stable/grafana/Chart.yaml                |  2 +-
 stable/grafana/README.md                 |  1 +
 stable/grafana/templates/deployment.yaml |  6 +-----
 stable/grafana/values.yaml               | 10 ++++++++++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml
index 11b0d0f29a..cce1a9d37b 100755
--- a/stable/grafana/Chart.yaml
+++ b/stable/grafana/Chart.yaml
@@ -1,5 +1,5 @@
 name: grafana
-version: 0.5.2
+version: 0.5.3
 description: The leading tool for querying and visualizing time series and metrics.
 home: https://grafana.net
 icon: https://raw.githubusercontent.com/grafana/grafana/master/public/img/logo_transparent_400x.png
diff --git a/stable/grafana/README.md b/stable/grafana/README.md
index 6f72b274c4..3b7a636959 100644
--- a/stable/grafana/README.md
+++ b/stable/grafana/README.md
@@ -40,6 +40,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `server.persistentVolume.accessMode`      | ReadWriteOnce or ReadOnly           | [ReadWriteOnce]                                   |
 | `server.persistentVolume.existingClaim`   | Existing persistent volume claim    | null                                              |
 | `server.persistentVolume.subPath`         | Subdirectory of pvc to mount        | null                                              |
+| `server.readinessProbe`                   | Server readiness probe              | httpGet: {path: /login, port: 3000}, initialDelaySeconds: 30, timeoutSeconds: 30 |
 | `server.resources`                        | Server resource requests and limits | requests: {cpu: 100m, memory: 100Mi}              |
 | `server.tolerations`                      | node taints to tolerate (requires Kubernetes >=1.6) | null |
 | `server.service.annotations`              | Service annotations                 | null                                              |
diff --git a/stable/grafana/templates/deployment.yaml b/stable/grafana/templates/deployment.yaml
index 16d5489b48..0b125b0744 100644
--- a/stable/grafana/templates/deployment.yaml
+++ b/stable/grafana/templates/deployment.yaml
@@ -58,11 +58,7 @@ spec:
           ports:
             - containerPort: 3000
           readinessProbe:
-            httpGet:
-              path: /login
-              port: 3000
-            initialDelaySeconds: 30
-            timeoutSeconds: 30
+{{ toYaml .Values.server.readinessProbe | indent 12 }}
           resources:
 {{ toYaml .Values.server.resources | indent 12 }}
           volumeMounts:
diff --git a/stable/grafana/values.yaml b/stable/grafana/values.yaml
index 6837015a72..0de813b70a 100644
--- a/stable/grafana/values.yaml
+++ b/stable/grafana/values.yaml
@@ -109,6 +109,16 @@ server:
       cpu: 100m
       memory: 100Mi
 
+  ## Grafana readiness probe
+  ## Ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
+  ##
+  readinessProbe:
+    httpGet:
+      path: /login
+      port: 3000
+    initialDelaySeconds: 30
+    timeoutSeconds: 30
+
   ## Grafana service
   service:
     ## Grafana service annotations