diff --git a/upstreamed/rabbitmq/Chart.yaml b/upstreamed/rabbitmq/Chart.yaml index b34acfe3b..5f860329d 100644 --- a/upstreamed/rabbitmq/Chart.yaml +++ b/upstreamed/rabbitmq/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: rabbitmq -version: 5.2.0 +version: 5.3.0 appVersion: 3.7.14 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP) keywords: diff --git a/upstreamed/rabbitmq/README.md b/upstreamed/rabbitmq/README.md index 7efa57274..c53cd0566 100644 --- a/upstreamed/rabbitmq/README.md +++ b/upstreamed/rabbitmq/README.md @@ -79,6 +79,7 @@ The following table lists the configurable parameters of the RabbitMQ chart and | `persistence.enabled` | Use a PVC to persist data | `true` | | `service.annotations` | service annotations as an array | [] | | `persistence.storageClass` | Storage class of backing PVC | `nil` (uses alpha storage class annotation) | +| `persistence.existingClaim` | RabbitMQ data Persistent Volume existing claim name | "" | | `persistence.accessMode` | Use volume as ReadOnly or ReadWrite | `ReadWriteOnce` | | `persistence.size` | Size of data volume | `8Gi` | | `persistence.path` | Mount path of the data volume | `/opt/bitnami/rabbitmq/var/lib/rabbitmq` | diff --git a/upstreamed/rabbitmq/templates/statefulset.yaml b/upstreamed/rabbitmq/templates/statefulset.yaml index 3e7349026..c47d4238f 100644 --- a/upstreamed/rabbitmq/templates/statefulset.yaml +++ b/upstreamed/rabbitmq/templates/statefulset.yaml @@ -264,6 +264,10 @@ spec: {{- if not .Values.persistence.enabled }} - name: data emptyDir: {} + {{- else if .Values.persistence.existingClaim }} + - name: data + persistentVolumeClaim: + claimName: {{ .Values.persistence.existingClaim }} {{- else }} volumeClaimTemplates: - metadata: diff --git a/upstreamed/rabbitmq/values-production.yaml b/upstreamed/rabbitmq/values-production.yaml index 3a0460e24..f70404790 100644 --- a/upstreamed/rabbitmq/values-production.yaml +++ b/upstreamed/rabbitmq/values-production.yaml @@ -164,6 +164,9 @@ persistence: # storageClass: "-" accessMode: ReadWriteOnce + ## Existing PersistentVolumeClaims + # existingClaim: "" + # If you change this value, you might have to adjust `rabbitmq.diskFreeLimit` as well. size: 8Gi diff --git a/upstreamed/rabbitmq/values.yaml b/upstreamed/rabbitmq/values.yaml index 2184b1132..53c186cb9 100644 --- a/upstreamed/rabbitmq/values.yaml +++ b/upstreamed/rabbitmq/values.yaml @@ -165,6 +165,9 @@ persistence: # storageClass: "-" accessMode: ReadWriteOnce + ## Existing PersistentVolumeClaims + # existingClaim: "" + # If you change this value, you might have to adjust `rabbitmq.diskFreeLimit` as well. size: 8Gi