From fd7ace66734a583e060dc759c3ccb488117df798 Mon Sep 17 00:00:00 2001
From: satchpx <42478164+satchpx@users.noreply.github.com>
Date: Fri, 31 May 2019 19:36:22 -0700
Subject: [PATCH] updates to support alternate k8s scheduler (#14357)

Signed-off-by: Sathya Balakrishnan <sathya@portworx.com>
---
 stable/grafana/Chart.yaml                | 2 +-
 stable/grafana/README.md                 | 1 +
 stable/grafana/templates/deployment.yaml | 5 ++++-
 stable/grafana/values.yaml               | 5 +++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml
index 52dcd28235..dfb4c9c8d6 100755
--- a/stable/grafana/Chart.yaml
+++ b/stable/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: grafana
-version: 3.3.11
+version: 3.4.0
 appVersion: 6.2.0
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
diff --git a/stable/grafana/README.md b/stable/grafana/README.md
index 8e4f89eb76..a1a06d0f71 100644
--- a/stable/grafana/README.md
+++ b/stable/grafana/README.md
@@ -58,6 +58,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `affinity`                                | Affinity settings for pod assignment          | `{}`                                                    |
 | `extraInitContainers`                     | Init containers to add to the grafana pod     | `{}` |
 | `extraContainers`                         | Sidecar containers to add to the grafana pod  | `{}` |
+| `schedulerName`                           | Name of the k8s scheduler (other than default) | `nil`                                                  |
 | `persistence.enabled`                     | Use persistent volume to store data           | `false`                                                 |
 | `persistence.size`                        | Size of persistent volume claim               | `10Gi`                                                  |
 | `persistence.existingClaim`               | Use an existing PVC to persist data           | `nil`                                                   |
diff --git a/stable/grafana/templates/deployment.yaml b/stable/grafana/templates/deployment.yaml
index 7692fbc380..be18aaac86 100644
--- a/stable/grafana/templates/deployment.yaml
+++ b/stable/grafana/templates/deployment.yaml
@@ -31,7 +31,7 @@ spec:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         checksum/dashboards-json-config: {{ include (print $.Template.BasePath "/dashboards-json-configmap.yaml") . | sha256sum }}
-        checksum/sc-dashboard-provider-config: {{ include (print $.Template.BasePath "/configmap-dashboard-provider.yaml") . | sha256sum }}    
+        checksum/sc-dashboard-provider-config: {{ include (print $.Template.BasePath "/configmap-dashboard-provider.yaml") . | sha256sum }}
 {{- if not .Values.admin.existingSecret }}
         checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
 {{- end }}
@@ -39,6 +39,9 @@ spec:
 {{ toYaml . | indent 8 }}
 {{- end }}
     spec:
+      {{- if .Values.schedulerName }}
+      schedulerName: "{{ .Values.schedulerName }}"
+      {{- end }}
       serviceAccountName: {{ template "grafana.serviceAccountName" . }}
 {{- if .Values.schedulerName }}
       schedulerName: "{{ .Values.schedulerName }}"
diff --git a/stable/grafana/values.yaml b/stable/grafana/values.yaml
index 585061e562..e9482da60f 100644
--- a/stable/grafana/values.yaml
+++ b/stable/grafana/values.yaml
@@ -25,6 +25,11 @@ livenessProbe:
   timeoutSeconds: 30
   failureThreshold: 10
 
+## Use an alternate scheduler, e.g. "stork".
+## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
+##
+# schedulerName: "default-scheduler"
+
 image:
   repository: grafana/grafana
   tag: 6.2.0