From 08910e2ec3ca04e7bb39c4e59d6d078da517b5af Mon Sep 17 00:00:00 2001 From: Cata <52822073+catalin-me@users.noreply.github.com> Date: Thu, 21 Oct 2021 09:54:10 +0300 Subject: [PATCH] [bitnami/redis] Use memory for emptyDirs (#7826) --- bitnami/redis/Chart.yaml | 2 +- bitnami/redis/README.md | 2 ++ .../redis/templates/master/statefulset.yaml | 18 ++++++++++++++ .../redis/templates/replicas/statefulset.yaml | 12 ++++++++++ .../redis/templates/sentinel/statefulset.yaml | 24 +++++++++++++++++++ bitnami/redis/values.yaml | 6 +++++ 6 files changed, 63 insertions(+), 1 deletion(-) diff --git a/bitnami/redis/Chart.yaml b/bitnami/redis/Chart.yaml index 488a5e11f..ba436ee97 100644 --- a/bitnami/redis/Chart.yaml +++ b/bitnami/redis/Chart.yaml @@ -25,4 +25,4 @@ name: redis sources: - https://github.com/bitnami/bitnami-docker-redis - http://redis.io/ -version: 15.4.2 +version: 15.5.0 diff --git a/bitnami/redis/README.md b/bitnami/redis/README.md index 2e2b7843f..96c6932e5 100644 --- a/bitnami/redis/README.md +++ b/bitnami/redis/README.md @@ -171,6 +171,7 @@ The command removes all the Kubernetes components associated with the chart and | `master.sidecars` | Add additional sidecar containers to the Redis™ master pod(s) | `[]` | | `master.initContainers` | Add additional init containers to the Redis™ master pod(s) | `[]` | | `master.persistence.enabled` | Enable persistence on Redis™ master nodes using Persistent Volume Claims | `true` | +| `master.persistence.medium` | Provide a medium for `emptyDir` volumes. | `""` | | `master.persistence.path` | The path the volume will be mounted at on Redis™ master containers | `/data` | | `master.persistence.subPath` | The subdirectory of the volume to mount on Redis™ master containers | `""` | | `master.persistence.storageClass` | Persistent Volume storage class | `""` | @@ -247,6 +248,7 @@ The command removes all the Kubernetes components associated with the chart and | `replica.sidecars` | Add additional sidecar containers to the Redis™ replicas pod(s) | `[]` | | `replica.initContainers` | Add additional init containers to the Redis™ replicas pod(s) | `[]` | | `replica.persistence.enabled` | Enable persistence on Redis™ replicas nodes using Persistent Volume Claims | `true` | +| `replica.persistence.medium` | Provide a medium for `emptyDir` volumes. | `""` | | `replica.persistence.path` | The path the volume will be mounted at on Redis™ replicas containers | `/data` | | `replica.persistence.subPath` | The subdirectory of the volume to mount on Redis™ replicas containers | `""` | | `replica.persistence.storageClass` | Persistent Volume storage class | `""` | diff --git a/bitnami/redis/templates/master/statefulset.yaml b/bitnami/redis/templates/master/statefulset.yaml index a2bdd6ccd..a51e9a43e 100644 --- a/bitnami/redis/templates/master/statefulset.yaml +++ b/bitnami/redis/templates/master/statefulset.yaml @@ -375,9 +375,21 @@ spec: path: /sys {{- end }} - name: redis-tmp-conf + {{- if .Values.master.persistence.medium }} + emptyDir: { + medium: {{ .Values.master.persistence.medium | quote }} + } + {{- else }} emptyDir: {} + {{- end }} - name: tmp + {{- if .Values.master.persistence.medium }} + emptyDir: { + medium: {{ .Values.master.persistence.medium | quote }} + } + {{- else }} emptyDir: {} + {{- end }} {{- if .Values.tls.enabled }} - name: redis-certificates secret: @@ -392,7 +404,13 @@ spec: {{- end }} {{- if not .Values.master.persistence.enabled }} - name: redis-data + {{- if .Values.master.persistence.medium }} + emptyDir: { + medium: {{ .Values.master.persistence.medium | quote }} + } + {{- else }} emptyDir: {} + {{- end }} {{- else if .Values.master.persistence.existingClaim }} - name: redis-data persistentVolumeClaim: diff --git a/bitnami/redis/templates/replicas/statefulset.yaml b/bitnami/redis/templates/replicas/statefulset.yaml index 56cbaec10..b1526aae7 100644 --- a/bitnami/redis/templates/replicas/statefulset.yaml +++ b/bitnami/redis/templates/replicas/statefulset.yaml @@ -387,7 +387,13 @@ spec: path: /sys {{- end }} - name: redis-tmp-conf + {{- if .Values.replica.persistence.medium }} + emptyDir: { + medium: {{ .Values.replica.persistence.medium | quote }} + } + {{- else }} emptyDir: {} + {{- end }} {{- if .Values.tls.enabled }} - name: redis-certificates secret: @@ -402,7 +408,13 @@ spec: {{- end }} {{- if not .Values.replica.persistence.enabled }} - name: redis-data + {{- if .Values.replica.persistence.medium }} + emptyDir: { + medium: {{ .Values.replica.persistence.medium | quote }} + } + {{- else }} emptyDir: {} + {{- end }} {{- else }} volumeClaimTemplates: - metadata: diff --git a/bitnami/redis/templates/sentinel/statefulset.yaml b/bitnami/redis/templates/sentinel/statefulset.yaml index db37fd20e..76014a3a1 100644 --- a/bitnami/redis/templates/sentinel/statefulset.yaml +++ b/bitnami/redis/templates/sentinel/statefulset.yaml @@ -542,11 +542,29 @@ spec: path: /sys {{- end }} - name: sentinel-tmp-conf + {{- if .Values.replica.persistence.medium }} + emptyDir: { + medium: {{ .Values.replica.persistence.medium | quote }} + } + {{- else }} emptyDir: {} + {{- end }} - name: redis-tmp-conf + {{- if .Values.replica.persistence.medium }} + emptyDir: { + medium: {{ .Values.replica.persistence.medium | quote }} + } + {{- else }} emptyDir: {} + {{- end }} - name: tmp + {{- if .Values.replica.persistence.medium }} + emptyDir: { + medium: {{ .Values.replica.persistence.medium | quote }} + } + {{- else }} emptyDir: {} + {{- end }} {{- if .Values.replica.extraVolumes }} {{- include "common.tplvalues.render" ( dict "value" .Values.replica.extraVolumes "context" $ ) | nindent 8 }} {{- end }} @@ -561,7 +579,13 @@ spec: {{- end }} {{- if not .Values.replica.persistence.enabled }} - name: redis-data + {{- if .Values.replica.persistence.medium }} + emptyDir: { + medium: {{ .Values.replica.persistence.medium | quote }} + } + {{- else }} emptyDir: {} + {{- end }} {{- else }} volumeClaimTemplates: - metadata: diff --git a/bitnami/redis/values.yaml b/bitnami/redis/values.yaml index cc5cc8011..4b17ac2fe 100644 --- a/bitnami/redis/values.yaml +++ b/bitnami/redis/values.yaml @@ -361,6 +361,9 @@ master: ## @param master.persistence.enabled Enable persistence on Redis™ master nodes using Persistent Volume Claims ## enabled: true + ## @param master.persistence.medium Provide a medium for `emptyDir` volumes. + ## + medium: "" ## @param master.persistence.path The path the volume will be mounted at on Redis™ master containers ## NOTE: Useful when using different Redis™ images ## @@ -670,6 +673,9 @@ replica: ## @param replica.persistence.enabled Enable persistence on Redis™ replicas nodes using Persistent Volume Claims ## enabled: true + ## @param replica.persistence.medium Provide a medium for `emptyDir` volumes. + ## + medium: "" ## @param replica.persistence.path The path the volume will be mounted at on Redis™ replicas containers ## NOTE: Useful when using different Redis™ images ##