From b6c94ab070cc6cbc2244c06c2762a11450ccf7aa Mon Sep 17 00:00:00 2001 From: Mac Chaffee Date: Mon, 22 Nov 2021 02:27:49 -0500 Subject: [PATCH] [bitnami/redis] Support custom dataSource to allow creating volumes from VolumeSnapshots (#8185) --- bitnami/redis/Chart.lock | 6 +++--- bitnami/redis/Chart.yaml | 2 +- bitnami/redis/README.md | 2 ++ bitnami/redis/templates/master/statefulset.yaml | 3 +++ bitnami/redis/templates/replicas/statefulset.yaml | 3 +++ bitnami/redis/values.yaml | 4 ++++ 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/bitnami/redis/Chart.lock b/bitnami/redis/Chart.lock index ec165312a4..cc3400b406 100644 --- a/bitnami/redis/Chart.lock +++ b/bitnami/redis/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common repository: https://charts.bitnami.com/bitnami - version: 1.10.0 -digest: sha256:d6f283322d34efda54721ddd67aec935f1bea501c7b45dfbe89814aed21ae5dc -generated: "2021-10-04T14:32:42.919560577Z" + version: 1.10.1 +digest: sha256:46a0218b2fbb421c87da91166dc5230d3ec85aa7d822dff1d479619fff8314e7 +generated: "2021-11-18T17:38:31.365659-05:00" diff --git a/bitnami/redis/Chart.yaml b/bitnami/redis/Chart.yaml index 9d4b0c01aa..8218d78484 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.5.5 +version: 15.6.0 diff --git a/bitnami/redis/README.md b/bitnami/redis/README.md index 47e864dd3e..2bdaed8e6f 100644 --- a/bitnami/redis/README.md +++ b/bitnami/redis/README.md @@ -179,6 +179,7 @@ The command removes all the Kubernetes components associated with the chart and | `master.persistence.size` | Persistent Volume size | `8Gi` | | `master.persistence.annotations` | Additional custom annotations for the PVC | `{}` | | `master.persistence.selector` | Additional labels to match for the PVC | `{}` | +| `master.persistence.dataSource` | Custom PVC data source | `{}` | | `master.persistence.existingClaim` | Use a existing PVC which must be created manually before bound | `""` | | `master.service.type` | Redis™ master service type | `ClusterIP` | | `master.service.port` | Redis™ master service port | `6379` | @@ -256,6 +257,7 @@ The command removes all the Kubernetes components associated with the chart and | `replica.persistence.size` | Persistent Volume size | `8Gi` | | `replica.persistence.annotations` | Additional custom annotations for the PVC | `{}` | | `replica.persistence.selector` | Additional labels to match for the PVC | `{}` | +| `replica.persistence.dataSource` | Custom PVC data source | `{}` | | `replica.service.type` | Redis™ replicas service type | `ClusterIP` | | `replica.service.port` | Redis™ replicas service port | `6379` | | `replica.service.nodePort` | Node port for Redis™ replicas | `""` | diff --git a/bitnami/redis/templates/master/statefulset.yaml b/bitnami/redis/templates/master/statefulset.yaml index a51e9a43ec..70b0748de9 100644 --- a/bitnami/redis/templates/master/statefulset.yaml +++ b/bitnami/redis/templates/master/statefulset.yaml @@ -435,6 +435,9 @@ spec: {{- if .Values.master.persistence.selector }} selector: {{- include "common.tplvalues.render" (dict "value" .Values.master.persistence.selector "context" $) | nindent 10 }} {{- end }} + {{- if .Values.master.persistence.dataSource }} + dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.master.persistence.dataSource "context" $) | nindent 10 }} + {{- end }} {{- include "common.storage.class" (dict "persistence" .Values.master.persistence "global" .Values.global) | nindent 8 }} {{- end }} {{- end }} diff --git a/bitnami/redis/templates/replicas/statefulset.yaml b/bitnami/redis/templates/replicas/statefulset.yaml index b1526aae7d..aad2deb97e 100644 --- a/bitnami/redis/templates/replicas/statefulset.yaml +++ b/bitnami/redis/templates/replicas/statefulset.yaml @@ -435,6 +435,9 @@ spec: {{- if .Values.replica.persistence.selector }} selector: {{- include "common.tplvalues.render" (dict "value" .Values.replica.persistence.selector "context" $) | nindent 10 }} {{- end }} + {{- if .Values.replica.persistence.dataSource }} + dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.replica.persistence.dataSource "context" $) | nindent 10 }} + {{- end }} {{- include "common.storage.class" (dict "persistence" .Values.replica.persistence "global" .Values.global) | nindent 8 }} {{- end }} {{- end }} diff --git a/bitnami/redis/values.yaml b/bitnami/redis/values.yaml index 7feb2fe8ed..2aae29b597 100644 --- a/bitnami/redis/values.yaml +++ b/bitnami/redis/values.yaml @@ -395,6 +395,8 @@ master: ## app: my-app ## selector: {} + ## @param master.persistence.dataSource Custom PVC data source + dataSource: {} ## @param master.persistence.existingClaim Use a existing PVC which must be created manually before bound ## NOTE: requires master.persistence.enabled: true ## @@ -707,6 +709,8 @@ replica: ## app: my-app ## selector: {} + ## @param replica.persistence.dataSource Custom PVC data source + dataSource: {} ## Redis™ replicas service parameters ## service: