[stable/grafana] fix dashboards-json-configmap, add registry+pullSecrets (#4925)

* [stable/grafana] fix dashboards-json-configmap and add registry+pullSecrets

* increase version

* [stable/grafana] remove registry vars

stable/grafana/Chart.yaml

@@ -1,5 +1,5 @@
 name: grafana
-version: 1.0.2
+version: 1.1.0
 appVersion: 5.0.4
 description: The leading tool for querying and visualizing time series and metrics.
 home: https://grafana.net

stable/grafana/templates/dashboards-json-configmap.yaml

@@ -10,9 +10,9 @@ metadata:
 data:
 {{- if .Values.dashboards }}
   {{- range $key, $value := .Values.dashboards }}
-    {{ if hasKey $value "json" }}
+    {{- if hasKey $value "json" }}
   {{ $key }}.json: |
-    {{ $value.json }}
+{{ $value.json | indent 4 }}
     {{- end }}
   {{- end }}
 {{- end -}}

stable/grafana/templates/deployment.yaml

@@ -37,6 +37,12 @@ spec:
               mountPath: "/var/lib/grafana"
               subPath: {{ .Values.persistence.subPath }}
 {{- end }}
+      {{- if .Values.image.pullSecrets }}
+      imagePullSecrets:
+      {{- range .Values.image.pullSecrets }}
+        - name: {{ . }}
+      {{- end}}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

stable/grafana/values.yaml

@@ -5,10 +5,18 @@ image:
   tag: 5.0.4
   pullPolicy: IfNotPresent
 
+  ## Optionally specify an array of imagePullSecrets.
+  ## Secrets must be manually created in the namespace.
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+  ##
+  # pullSecrets:
+  #   - myRegistrKeySecretName
+
 downloadDashboardsImage:
   repository: appropriate/curl
   tag: latest
   pullPolicy: IfNotPresent
+
 ## Expose the grafana service to be accessed from outside the cluster (LoadBalancer service).
 ## or access it from within the cluster (ClusterIP service). Set the service type and the port to serve it.
 ## ref: http://kubernetes.io/docs/user-guide/services/