From e2e460e3bfd3dc5f05b6e18f4ecb5f55c724ff76 Mon Sep 17 00:00:00 2001
From: Amanda Cameron <git@amanda.darkdna.net>
Date: Mon, 30 Jan 2017 18:32:41 -0500
Subject: [PATCH] [stable/grafana] Update to the recommended pvc patterns.
 (#445)

* Convert chart grafana to use the recommended pvc patterns

* Update Chart.yaml

* update based on recommendations
---
 stable/grafana/Chart.yaml             | 2 +-
 stable/grafana/README.md              | 2 +-
 stable/grafana/templates/NOTES.txt    | 3 +--
 stable/grafana/templates/_helpers.tpl | 8 ++++----
 stable/grafana/templates/pvc.yaml     | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml
index b51a08d7f6..9a9ef7a963 100755
--- a/stable/grafana/Chart.yaml
+++ b/stable/grafana/Chart.yaml
@@ -1,5 +1,5 @@
 name: grafana
-version: 0.2.0
+version: 0.2.1
 description: A Helm chart for Kubernetes
 home: https://grafana.net
 sources:
diff --git a/stable/grafana/README.md b/stable/grafana/README.md
index 5a0ce0e5db..5ae0a3b4c3 100644
--- a/stable/grafana/README.md
+++ b/stable/grafana/README.md
@@ -37,6 +37,6 @@ The command removes all the Kubernetes components associated with the chart and
 | `server.adminPassword`                | Admin user password                 | admin                                             |
 | `server.persistentVolume.enabled`     | Create a volume to store data       | true                                              |
 | `server.persistentVolume.size`        | Size of persistent volume claim     | 1Gi RW                                            |
-| `server.persistentVolume.storageClass`| Type of persistent volume claim     | volume.alpha.kubernetes.io/storage-class: default |
+| `server.persistentVolume.storageClass`| Type of persistent volume claim     | `nil` (uses alpha storage class annotation)       |
 | `server.persistentVolume.accessMode`  | ReadWriteOnce or ReadOnly           | [ReadWriteOnce]                                   |
 | `server.resources`                    | Server resource requests and limits | requests: {cpu: 100m, memory: 100Mi}              |
diff --git a/stable/grafana/templates/NOTES.txt b/stable/grafana/templates/NOTES.txt
index 18ef318317..131244e42f 100644
--- a/stable/grafana/templates/NOTES.txt
+++ b/stable/grafana/templates/NOTES.txt
@@ -1,6 +1,6 @@
 1. Get your '{{ .Values.server.adminUser }}' user password by running:
 
-   printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "server.fullname" . }} -o jsonpath="{.data.grafana-admin-password[*]}"`);echo
+   printf $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "server.fullname" . }} -o jsonpath="{.data.grafana-admin-password}" | base64 --decode);echo
 
 2. The Grafana server can be accessed via port {{ .Values.server.httpPort }} on the following DNS name from within your cluster:
 
@@ -36,4 +36,3 @@
 ######            the Grafana pod is terminated.                            #####
 #################################################################################
 {{- end }}
-
diff --git a/stable/grafana/templates/_helpers.tpl b/stable/grafana/templates/_helpers.tpl
index 439d36295e..74470baf2c 100644
--- a/stable/grafana/templates/_helpers.tpl
+++ b/stable/grafana/templates/_helpers.tpl
@@ -3,7 +3,7 @@
 Expand the name of the chart.
 */}}
 {{- define "name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
@@ -12,7 +12,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 */}}
 {{- define "fullname" -}}
 {{- $name := default "grafana" .Values.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
@@ -20,5 +20,5 @@ Create a fully qualified server name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "server.fullname" -}}
-{{- printf "%s-%s" .Release.Name "grafana" | trunc 63 -}}
-{{- end -}}
\ No newline at end of file
+{{- printf "%s-%s" .Release.Name "grafana" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/stable/grafana/templates/pvc.yaml b/stable/grafana/templates/pvc.yaml
index 62eafdceaf..b6a0354ec4 100644
--- a/stable/grafana/templates/pvc.yaml
+++ b/stable/grafana/templates/pvc.yaml
@@ -4,7 +4,7 @@ kind: PersistentVolumeClaim
 metadata:
   annotations:
   {{- if .Values.server.persistentVolume.storageClass -}}
-    volume.beta.kubernetes.io/storage-class: {{ .Values.server.persistentVolume.storageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.server.persistentVolume.storageClass | quote }}
   {{ else }}
     volume.alpha.kubernetes.io/storage-class: default
   {{- end }}