[stable/rabbitmq] add persistence.existingClaim (#718)

* add persistence.existingClaim to rabbitmq

* cleanup templating

stable/rabbitmq/Chart.yaml

@@ -1,5 +1,5 @@
 name: rabbitmq
-version: 0.4.5
+version: 0.5.0
 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP)
 keywords:
 - rabbitmq

stable/rabbitmq/README.md

@@ -57,6 +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.existingClaim`| Use an existing PVC to persist data                     | `nil`                                                    |
 | `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`                                                    |
@@ -85,4 +86,15 @@ $ helm install --name my-release -f values.yaml stable/rabbitmq
 
 The [Bitnami RabbitMQ](https://github.com/bitnami/bitnami-docker-rabbitmq) image stores the RabbitMQ data and configurations at the `/bitnami/rabbitmq` path of the container.
 
-The chart mounts a [Persistent Volume](kubernetes.io/docs/user-guide/persistent-volumes/) volume at this location. The volume is created using dynamic volume provisioning.
+The chart mounts a [Persistent Volume](kubernetes.io/docs/user-guide/persistent-volumes/) volume at this location. By default, the volume is created using dynamic volume provisioning. An existing PersistentVolumeClaim can also be defined.
+
+
+### Existing PersistentVolumeClaims
+
+1. Create the PersistentVolume
+1. Create the PersistentVolumeClaim
+1. Install the chart
+```bash
+$ helm install --set persistence.existingClaim=PVC_NAME rabbitmq
+``
+

stable/rabbitmq/templates/deployment.yaml

@@ -74,7 +74,7 @@ spec:
       - name: data
       {{- if .Values.persistence.enabled }}
         persistentVolumeClaim:
-          claimName: {{ template "fullname" . }}
+          claimName: {{ .Values.persistence.existingClaim | default (include "fullname" .) }} 
       {{- else }}
         emptyDir: {}
       {{- end -}}

stable/rabbitmq/templates/pvc.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.persistence.enabled }}
+{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:

stable/rabbitmq/values.yaml

@@ -56,6 +56,12 @@ rabbitmqManagerPort: 15672
 
 persistence:
   enabled: true
+
+  ## A manually managed Persistent Volume and Claim
+  ## Requires persistence.enabled: true
+  ## If defined, PVC must be created manually before volume will be bound
+  # existingClaim:
+
   ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
   ## Default: volume.alpha.kubernetes.io/storage-class: default
   ##