[stable/grafana] Fixed storageClass annotation (#624)

* Fixed gotmpl whitespace

* Version bump

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

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 }}

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 }}

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 }}

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 }}

stable/grafana/values.yaml

@@ -325,4 +325,4 @@ serverConfigFile:
 ##
 ## and add it below.
 ##
-serverDashboardFiles:
+serverDashboardFiles: {}