From d236cd2c24bee0e95193ad6dfce90ea6f31dfba9 Mon Sep 17 00:00:00 2001 From: vtuson Date: Thu, 10 May 2018 10:53:53 +0200 Subject: [PATCH] change from using PVC to PVCtemplates for better availbility (#5478) * change from using PVC to PVCtemplates for better availbility * bumping chart version * updated with comments from Tomas * making chart 1.0.0 --- stable/rabbitmq/Chart.yaml | 2 +- stable/rabbitmq/README.md | 1 - stable/rabbitmq/templates/pvc.yaml | 24 ------------------ stable/rabbitmq/templates/statefulset.yaml | 29 ++++++++++++++++++---- stable/rabbitmq/values-production.yaml | 5 ---- stable/rabbitmq/values.yaml | 6 +---- 6 files changed, 26 insertions(+), 41 deletions(-) delete mode 100644 stable/rabbitmq/templates/pvc.yaml diff --git a/stable/rabbitmq/Chart.yaml b/stable/rabbitmq/Chart.yaml index 2f039a35ad..ad61f9e164 100644 --- a/stable/rabbitmq/Chart.yaml +++ b/stable/rabbitmq/Chart.yaml @@ -1,5 +1,5 @@ name: rabbitmq -version: 0.8.2 +version: 1.0.0 appVersion: 3.7.4 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP) keywords: diff --git a/stable/rabbitmq/README.md b/stable/rabbitmq/README.md index 6f8a38a16b..25ea144923 100644 --- a/stable/rabbitmq/README.md +++ b/stable/rabbitmq/README.md @@ -62,7 +62,6 @@ The following table lists the configurable parameters of the RabbitMQ chart and | `rabbitmq.configuration` | rabbitmq.conf content | see values.yaml | | `serviceType` | Kubernetes Service type | `ClusterIP` | | `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` | diff --git a/stable/rabbitmq/templates/pvc.yaml b/stable/rabbitmq/templates/pvc.yaml deleted file mode 100644 index 2d62f9bff4..0000000000 --- a/stable/rabbitmq/templates/pvc.yaml +++ /dev/null @@ -1,24 +0,0 @@ -{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "rabbitmq.fullname" . }} - labels: - app: {{ template "rabbitmq.name" . }} - chart: {{ template "rabbitmq.chart" . }} - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" -spec: - accessModes: - - {{ .Values.persistence.accessMode | quote }} - resources: - requests: - storage: {{ .Values.persistence.size | quote }} -{{- if .Values.persistence.storageClass }} -{{- if (eq "-" .Values.persistence.storageClass) }} - storageClassName: "" -{{- else }} - storageClassName: "{{ .Values.persistence.storageClass }}" -{{- end }} -{{- end }} -{{- end }} diff --git a/stable/rabbitmq/templates/statefulset.yaml b/stable/rabbitmq/templates/statefulset.yaml index 03a5c09ec5..55b6a39daa 100644 --- a/stable/rabbitmq/templates/statefulset.yaml +++ b/stable/rabbitmq/templates/statefulset.yaml @@ -142,10 +142,29 @@ spec: path: rabbitmq.conf - key: enabled_plugins path: enabled_plugins + {{- if not .Values.persistence.enabled }} - name: data - {{- if .Values.persistence.enabled }} - persistentVolumeClaim: - claimName: {{ .Values.persistence.existingClaim | default (include "rabbitmq.fullname" .) }} - {{- else }} emptyDir: {} - {{- end -}} + {{- else }} + volumeClaimTemplates: + - metadata: + name: data + labels: + app: {{ template "rabbitmq.name" . }} + chart: {{ template "rabbitmq.chart" . }} + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" + spec: + accessModes: + - {{ .Values.persistence.accessMode | quote }} + resources: + requests: + storage: {{ .Values.persistence.size | quote }} + {{- if .Values.persistence.storageClass }} + {{- if (eq "-" .Values.persistence.storageClass) }} + storageClassName: "" + {{- else }} + storageClassName: "{{ .Values.persistence.storageClass }}" + {{- end }} + {{- end }} + {{- end }} diff --git a/stable/rabbitmq/values-production.yaml b/stable/rabbitmq/values-production.yaml index de870f0864..e2115021ca 100644 --- a/stable/rabbitmq/values-production.yaml +++ b/stable/rabbitmq/values-production.yaml @@ -89,11 +89,6 @@ serviceType: ClusterIP 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: - ## rabbitmq data Persistent Volume Storage Class ## If defined, storageClassName: ## If set to "-", storageClassName: "", which disables dynamic provisioning diff --git a/stable/rabbitmq/values.yaml b/stable/rabbitmq/values.yaml index d0bcdec65e..ae20a0ebc1 100644 --- a/stable/rabbitmq/values.yaml +++ b/stable/rabbitmq/values.yaml @@ -86,13 +86,9 @@ rabbitmq: serviceType: ClusterIP persistence: + ## this enables PVC templates that will create one per pod enabled: false - ## A manually managed Persistent Volume and Claim - ## Requires persistence.enabled: true - ## If defined, PVC must be created manually before volume will be bound - # existingClaim: - ## rabbitmq data Persistent Volume Storage Class ## If defined, storageClassName: ## If set to "-", storageClassName: "", which disables dynamic provisioning