From d883c8bbadc8ca03b8f1d60cf59839c4bfce62ce Mon Sep 17 00:00:00 2001 From: ronakthamor Date: Tue, 27 Oct 2020 05:27:30 -0400 Subject: [PATCH] [bitnami/rabbitmq] Attach existing volume as persistence storage (#4102) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Attach existing volume as persistence storage * chart version update * changed indent to nindent * changed indent to nindent * changed indent to nindent * changed indent to nindent * revert changes from requirements.lock file and increment minor version of the chart * Update statefulset.yaml * Update statefulset.yaml * Update statefulset.yaml * Use a proper name * Update values-production.yaml Co-authored-by: Ronak Co-authored-by: Carlos Rodríguez Hernández --- bitnami/rabbitmq/Chart.yaml | 2 +- bitnami/rabbitmq/README.md | 1 + bitnami/rabbitmq/templates/statefulset.yaml | 5 +++++ bitnami/rabbitmq/values-production.yaml | 4 ++++ bitnami/rabbitmq/values.yaml | 4 ++++ 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/bitnami/rabbitmq/Chart.yaml b/bitnami/rabbitmq/Chart.yaml index 7e5fa0a8a..0628e0539 100644 --- a/bitnami/rabbitmq/Chart.yaml +++ b/bitnami/rabbitmq/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: rabbitmq -version: 7.6.9 +version: 7.7.0 appVersion: 3.8.9 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP) keywords: diff --git a/bitnami/rabbitmq/README.md b/bitnami/rabbitmq/README.md index a74aad3a8..ec5a604ce 100644 --- a/bitnami/rabbitmq/README.md +++ b/bitnami/rabbitmq/README.md @@ -195,6 +195,7 @@ The following table lists the configurable parameters of the RabbitMQ chart and | `persistence.accessMode` | PVC Access Mode for RabbitMQ data volume | `ReadWriteOnce` | | `persistence.size` | PVC Storage Request for RabbitMQ data volume | `8Gi` | | `persistence.selector` | Selector to match an existing Persistent Volume | `{}`(evaluated as a template) | +| `persistence.volumes` | Additional volumes without creating PVC | `{}`(evaluated as a template) | ### RBAC parameters diff --git a/bitnami/rabbitmq/templates/statefulset.yaml b/bitnami/rabbitmq/templates/statefulset.yaml index 779b862c9..24d7b0dec 100644 --- a/bitnami/rabbitmq/templates/statefulset.yaml +++ b/bitnami/rabbitmq/templates/statefulset.yaml @@ -272,6 +272,9 @@ spec: {{- include "common.tplvalues.render" (dict "value" .Values.sidecars "context" $) | nindent 8 }} {{- end }} volumes: + {{- if .Values.persistence.volumes }} + {{- toYaml .Values.persistence.volumes | nindent 8 }} + {{- end }} {{- if .Values.auth.tls.enabled }} - name: certs secret: @@ -302,6 +305,7 @@ spec: {{- if .Values.extraVolumes }} {{- toYaml .Values.extraVolumes | nindent 8 }} {{- end }} + {{- if not (contains "data" (quote .Values.persistence.volumes)) }} {{- if not .Values.persistence.enabled }} - name: data emptyDir: {} @@ -327,3 +331,4 @@ spec: selector: {{- include "common.tplvalues.render" (dict "value" .Values.persistence.selector "context" $) | nindent 10 }} {{- end -}} {{- end }} + {{- end }} diff --git a/bitnami/rabbitmq/values-production.yaml b/bitnami/rabbitmq/values-production.yaml index 703faa317..90fdae74b 100644 --- a/bitnami/rabbitmq/values-production.yaml +++ b/bitnami/rabbitmq/values-production.yaml @@ -487,6 +487,10 @@ persistence: ## size: 8Gi + volumes: + # - name: volume_name + # emptyDir: {} + ## Pod Disruption Budget configuration ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ ## diff --git a/bitnami/rabbitmq/values.yaml b/bitnami/rabbitmq/values.yaml index 251952ef9..92c6f7af1 100644 --- a/bitnami/rabbitmq/values.yaml +++ b/bitnami/rabbitmq/values.yaml @@ -488,6 +488,10 @@ persistence: ## size: 8Gi + volumes: + # - name: volume_name + # emptyDir: {} + ## Pod Disruption Budget configuration ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ ##