From e80d1cfb8857cc71096b3b8a4638a789b378db88 Mon Sep 17 00:00:00 2001
From: Michael Goodness <mgoodness@gmail.com>
Date: Mon, 13 Feb 2017 20:33:49 -0600
Subject: [PATCH] [stable/grafana] Fixed storageClass annotation (#624)

* Fixed gotmpl whitespace

* Version bump
---
 stable/grafana/Chart.yaml                          |  2 +-
 stable/grafana/templates/configmap.yaml            | 13 -------------
 stable/grafana/templates/dashboards-configmap.yaml | 12 ++++++++++++
 stable/grafana/templates/pvc.yaml                  |  4 ++--
 stable/grafana/templates/secret.yaml               |  8 ++++----
 stable/grafana/values.yaml                         |  2 +-
 6 files changed, 20 insertions(+), 21 deletions(-)
 create mode 100644 stable/grafana/templates/dashboards-configmap.yaml

diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml
index f397d22c20..7d7537452f 100755
--- a/stable/grafana/Chart.yaml
+++ b/stable/grafana/Chart.yaml
@@ -1,5 +1,5 @@
 name: grafana
-version: 0.2.2
+version: 0.2.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/templates/configmap.yaml b/stable/grafana/templates/configmap.yaml
index 6283a05731..69aef354b8 100644
--- a/stable/grafana/templates/configmap.yaml
+++ b/stable/grafana/templates/configmap.yaml
@@ -10,16 +10,3 @@ metadata:
   name: {{ template "server.fullname" . }}-config
 data:
 {{ toYaml .Values.serverConfigFile | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  labels:
-    app: {{ template "fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    component: "{{ .Values.server.name }}"
-    heritage: "{{ .Release.Service }}"
-    release: "{{ .Release.Name }}"
-  name: {{ template "server.fullname" . }}-dashs
-data:
-{{ toYaml .Values.serverDashboardFiles | indent 2 }}
\ No newline at end of file
diff --git a/stable/grafana/templates/dashboards-configmap.yaml b/stable/grafana/templates/dashboards-configmap.yaml
new file mode 100644
index 0000000000..12cd8a9510
--- /dev/null
+++ b/stable/grafana/templates/dashboards-configmap.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    component: "{{ .Values.server.name }}"
+    heritage: "{{ .Release.Service }}"
+    release: "{{ .Release.Name }}"
+  name: {{ template "server.fullname" . }}-dashs
+data:
+{{ toYaml .Values.serverDashboardFiles | indent 2 }}
diff --git a/stable/grafana/templates/pvc.yaml b/stable/grafana/templates/pvc.yaml
index b6a0354ec4..eacdf97cda 100644
--- a/stable/grafana/templates/pvc.yaml
+++ b/stable/grafana/templates/pvc.yaml
@@ -3,9 +3,9 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   annotations:
-  {{- if .Values.server.persistentVolume.storageClass -}}
+  {{- if .Values.server.persistentVolume.storageClass }}
     volume.beta.kubernetes.io/storage-class: {{ .Values.server.persistentVolume.storageClass | quote }}
-  {{ else }}
+  {{- else }}
     volume.alpha.kubernetes.io/storage-class: default
   {{- end }}
   {{- range $key, $value := .Values.server.persistentVolume.annotations }}
diff --git a/stable/grafana/templates/secret.yaml b/stable/grafana/templates/secret.yaml
index ee68d91e8d..88f7121f87 100644
--- a/stable/grafana/templates/secret.yaml
+++ b/stable/grafana/templates/secret.yaml
@@ -9,9 +9,9 @@ metadata:
   name: {{ template "server.fullname" . }}
 type: Opaque
 data:
-  {{ if .Values.server.adminPassword }}
-  grafana-admin-password:  {{ .Values.server.adminPassword | b64enc | quote }}
-  {{ else }}
+  {{- if .Values.server.adminPassword }}
+  grafana-admin-password: {{ .Values.server.adminPassword | b64enc | quote }}
+  {{- else }}
   grafana-admin-password: {{ randAlphaNum 10 | b64enc | quote }}
-  {{ end }}
+  {{- end }}
   grafana-admin-user: {{ .Values.server.adminUser | b64enc | quote }}
diff --git a/stable/grafana/values.yaml b/stable/grafana/values.yaml
index d3a3e9fa38..5b2a4e7b5a 100644
--- a/stable/grafana/values.yaml
+++ b/stable/grafana/values.yaml
@@ -325,4 +325,4 @@ serverConfigFile:
 ##
 ## and add it below.
 ##
-serverDashboardFiles:
+serverDashboardFiles: {}