diff --git a/bitnami/redis-cluster/.helmignore b/bitnami/redis-cluster/.helmignore index b2767ae17..f0c131944 100644 --- a/bitnami/redis-cluster/.helmignore +++ b/bitnami/redis-cluster/.helmignore @@ -1,3 +1,21 @@ -.git -# OWNERS file for Kubernetes -OWNERS +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj diff --git a/bitnami/redis-cluster/Chart.yaml b/bitnami/redis-cluster/Chart.yaml index 3bf8ed511..8979aafeb 100644 --- a/bitnami/redis-cluster/Chart.yaml +++ b/bitnami/redis-cluster/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: redis-cluster -version: 1.0.1 +version: 2.0.0 appVersion: 5.0.8 description: Open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets. keywords: diff --git a/bitnami/redis-cluster/README.md b/bitnami/redis-cluster/README.md index db0a4ef59..073591ee1 100644 --- a/bitnami/redis-cluster/README.md +++ b/bitnami/redis-cluster/README.md @@ -1,5 +1,5 @@ -# Redis +# Redis Cluster [Redis](http://redis.io/) is an advanced key-value cache and store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets, sorted sets, bitmaps and hyperloglogs. @@ -21,6 +21,18 @@ This chart bootstraps a [Redis](https://github.com/bitnami/bitnami-docker-redis) Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. This chart has been tested to work with NGINX Ingress, cert-manager, fluentd and Prometheus on top of the [BKPR](https://kubeprod.io/). +### Choose between Redis Helm Chart and Redis Cluster Helm Chart + +You can choose any of the two Redis Helm charts for deploying a Redis cluster. +While [Redis Helm Chart](https://github.com/bitnami/charts/tree/master/bitnami/redis) will deploy a master-slave cluster using Redis Sentinel, the [Redis Cluster Helm Chart](https://github.com/bitnami/charts/tree/master/bitnami/redis-cluster) will deploy a Redis Cluster topology with sharding. +The main features of each chart are the following: +| Redis | Redis Cluster | +| ----------------------------------------- | ----------------------------------------------------------- | +| Supports multiple databases | Supports only one database. Better if you have a big dataset | +| Single write point (single master) | Multiple write points (multiple masters) | +| ![Redis Topology](img/redis-topology.png) | ![Redis Cluster Topology](img/redis-cluster-topology.png) | + + ## Prerequisites - Kubernetes 1.12+ @@ -446,3 +458,9 @@ networkPolicy: ingressNSPodMatchLabels: redis-client: true ``` + +## Notable changes + +### 2.0.0 + +The version `1.0.0` was using a label in the Statefulset's volumeClaimTemplate that didn't allow to upgrade the chart. The version `2.0.0` fixed that issue. Also it adds more docs in the README.md. diff --git a/bitnami/redis-cluster/img/redis-cluster-topology.png b/bitnami/redis-cluster/img/redis-cluster-topology.png new file mode 100644 index 000000000..f0a02a9f8 Binary files /dev/null and b/bitnami/redis-cluster/img/redis-cluster-topology.png differ diff --git a/bitnami/redis-cluster/img/redis-topology.png b/bitnami/redis-cluster/img/redis-topology.png new file mode 100644 index 000000000..3f5280feb Binary files /dev/null and b/bitnami/redis-cluster/img/redis-topology.png differ diff --git a/bitnami/redis-cluster/templates/_helpers.tpl b/bitnami/redis-cluster/templates/_helpers.tpl index 1f5273517..2c4e0f375 100644 --- a/bitnami/redis-cluster/templates/_helpers.tpl +++ b/bitnami/redis-cluster/templates/_helpers.tpl @@ -10,7 +10,7 @@ Expand the name of the chart. Expand the chart plus release name (used by the chart label) */}} {{- define "redis-cluster.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* diff --git a/bitnami/redis-cluster/templates/redis-statefulset.yaml b/bitnami/redis-cluster/templates/redis-statefulset.yaml index 1a51413dc..542701183 100644 --- a/bitnami/redis-cluster/templates/redis-statefulset.yaml +++ b/bitnami/redis-cluster/templates/redis-statefulset.yaml @@ -305,7 +305,6 @@ spec: volumeClaimTemplates: - metadata: name: redis-data - labels: {{- include "redis-cluster.labels" . | nindent 10 }} spec: accessModes: {{- range .Values.persistence.accessModes }} diff --git a/bitnami/redis/Chart.yaml b/bitnami/redis/Chart.yaml index 226ca8526..709937058 100644 --- a/bitnami/redis/Chart.yaml +++ b/bitnami/redis/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: redis -version: 10.6.5 +version: 10.6.6 appVersion: 5.0.8 description: Open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets. keywords: diff --git a/bitnami/redis/README.md b/bitnami/redis/README.md index c723411d9..9f8511227 100644 --- a/bitnami/redis/README.md +++ b/bitnami/redis/README.md @@ -1,4 +1,3 @@ - # Redis [Redis](http://redis.io/) is an advanced key-value cache and store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets, sorted sets, bitmaps and hyperloglogs. @@ -23,6 +22,17 @@ This chart bootstraps a [Redis](https://github.com/bitnami/bitnami-docker-redis) Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. This chart has been tested to work with NGINX Ingress, cert-manager, fluentd and Prometheus on top of the [BKPR](https://kubeprod.io/). +### Choose between Redis Helm Chart and Redis Cluster Helm Chart + +You can choose any of the two Redis Helm charts for deploying a Redis cluster. +While [Redis Helm Chart](https://github.com/bitnami/charts/tree/master/bitnami/redis) will deploy a master-slave cluster using Redis Sentinel, the [Redis Cluster Helm Chart](https://github.com/bitnami/charts/tree/master/bitnami/redis-cluster) will deploy a Redis Cluster topology with sharding. +The main features of each chart are the following: +| Redis | Redis Cluster | +| ----------------------------------------- | ----------------------------------------------------------- | +| Supports multiple databases | Supports only one database. Better if you have a big dataset | +| Single write point (single master) | Multiple write points (multiple masters) | +| ![Redis Topology](img/redis-topology.png) | ![Redis Cluster Topology](img/redis-cluster-topology.png) | + ## Prerequisites - Kubernetes 1.12+ diff --git a/bitnami/redis/img/redis-cluster-topology.png b/bitnami/redis/img/redis-cluster-topology.png new file mode 100644 index 000000000..f0a02a9f8 Binary files /dev/null and b/bitnami/redis/img/redis-cluster-topology.png differ diff --git a/bitnami/redis/img/redis-topology.png b/bitnami/redis/img/redis-topology.png new file mode 100644 index 000000000..3f5280feb Binary files /dev/null and b/bitnami/redis/img/redis-topology.png differ