[stable/rabbitmq] Update to the recommended pvc patterns. (helm#464)

* Convert chart rabbitmq to use the recommended pvc patterns * fix notes for 1.5 * truncate to 63 and trim trailing dashes * remove annotations and fix trunc in pvc * document alpha storage class fallback * bump version
intelfx · Jan 31, 2017 · b393cbd · b393cbd
1 parent 5f99812
commit b393cbd
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -1,5 +1,5 @@
 name: rabbitmq
-version: 0.4.0
+version: 0.4.1
 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP)
 keywords:
 - rabbitmq

diff --git a/README.md b/README.md
@@ -57,7 +57,7 @@ The following tables lists the configurable parameters of the RabbitMQ chart and
 | `rabbitmqVhost`            | RabbitMQ application vhost                              | `/`                                                      |
 | `rabbitmqManagerPort`      | RabbitMQ Manager port                                   | `15672`                                                  |
 | `persistence.enabled`      | Use a PVC to persist data                               | `true`                                                   |
-| `persistence.storageClass` | Storage class of backing PVC                            | `generic`                                                |
+| `persistence.storageClass` | Storage class of backing PVC                            | `nil` (uses alpha storage class annotation)              |
 | `persistence.accessMode`   | Use volume as ReadOnly or ReadWrite                     | `ReadWriteOnce`                                          |
 | `persistence.size`         | Size of data volume                                     | `8Gi`                                                    |
 

diff --git a/templates/NOTES.txt b/templates/NOTES.txt
@@ -4,8 +4,8 @@
 The RabbitMQ AMQP port {{ default "5672" .Values.rabbitmqNodePort }} can be accessed on the following DNS name from within your cluster: {{ template "fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
 
   echo Username      : {{ .Values.rabbitmqUsername }}
-  echo Password      : $(printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.rabbitmq-password[*]}"`))
-  echo ErLang Cookie : $(printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.rabbitmq-erlang-cookie[*]}"`))
+  echo Password      : $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.rabbitmq-password}" | base64 --decode)
+  echo ErLang Cookie : $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.rabbitmq-erlang-cookie}" | base64 --decode)
 
 To Access the RabbitMQ Management interface:
 

diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -3,14 +3,14 @@
 Expand the name of the chart.
 */}}
 {{- define "name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 24 -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Create a default fully qualified app name.
-We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 24 -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
diff --git a/templates/pvc.yaml b/templates/pvc.yaml
@@ -4,7 +4,11 @@ apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}
   annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
+  {{- if .Values.persistence.storageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
+  {{- else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.accessMode | quote }}

diff --git a/values.yaml b/values.yaml
@@ -56,7 +56,10 @@ rabbitmqManagerPort: 15672
 
 persistence:
   enabled: true
-  storageClass: generic
+  ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
+  ## Default: volume.alpha.kubernetes.io/storage-class: default
+  ##
+  # storageClass:
   accessMode: ReadWriteOnce
   size: 8Gi