[bitnami/redis-cluster] Add TLS support for cluster (#2760)

* [bitnami/redis-cluster] Add TLS support to Redis-Cluster

Signed-off-by: joancafom <jcarmona@bitnami.com>

* [bitnami/redis-cluster] Update components versions

Signed-off-by: Bitnami Containers <containers@bitnami.com>

Co-authored-by: Carlos Rodríguez Hernández <carlosrh@vmware.com>
Co-authored-by: Bitnami Containers <containers@bitnami.com>

bitnami/redis-cluster/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: redis-cluster
-version: 2.2.4
+version: 2.3.0
 appVersion: 6.0.5
 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:

bitnami/redis-cluster/README.md

@@ -130,6 +130,13 @@ The following table lists the configurable parameters of the Redis chart and the
 | `podLabels`                                     | Additional labels for Redis pod                                | {}                |
 | `podAnnotations`                                | Additional annotations for Redis pod                           | {}                |
 | `redisPort`                                     | Redis port.                                                    | `6379`            |
+| `tls.enabled`                                   | Enable TLS support for replication traffic                     | `false`           |
+| `tls.authClients`                               | Require clients to authenticate or not                         | `true`            |
+| `tls.certificatesSecret`                        | Name of the secret that contains the certificates              | `nil`             |
+| `tls.certFilename`                              | Certificate filename                                           | `nil`             |
+| `tls.certKeyFilename`                           | Certificate key filename                                       | `nil`             |
+| `tls.certCAFilename`                            | CA Certificate filename                                        | `nil`             |
+| `tls.dhParamsFilename`                          | DH params (in order to support DH based ciphers)               | `nil`             |
 | `command`                                       | Redis entrypoint string. The command `redis-server` is executed if this is not provided. | `nil`             |
 | `args`                                          | Arguments for the provided command if needed                   | `nil`             |
 | `configmap`                                     | Additional Redis configuration for the nodes (this value is evaluated as a template) | `nil`             |
@@ -365,6 +372,36 @@ existingSecret=redis-password-secret
 metrics.enabled=true
 ```
 
+### Securing traffic using TLS
+
+TLS support can be enabled in the chart by specifying the `tls.` parameters while creating a release. The following parameters should be configured to properly enable the TLS support in the cluster:
+
+- `tls.enabled`: Enable TLS support. Defaults to `false`
+- `tls.certificatesSecret`: Name of the secret that contains the certificates. No defaults.
+- `tls.certFilename`: Certificate filename. No defaults.
+- `tls.certKeyFilename`: Certificate key filename. No defaults.
+- `tls.certCAFilename`: CA Certificate filename. No defaults.
+
+For example:
+
+First, create the secret with the cetificates files:
+
+```console
+kubectl create secret generic certificates-tls-secret --from-file=./cert.pem --from-file=./cert.key --from-file=./ca.pem
+```
+
+Then, use the following parameters:
+
+```console
+tls.enabled="true"
+tls.certificatesSecret="certificates-tls-secret"
+tls.certFilename="cert.pem"
+tls.certKeyFilename="cert.key"
+tls.certCAFilename="ca.pem"
+```
+
+> **Note TLS and Prometheus Metrics**: Current version of Redis Metrics Exporter (v1.6.1 at the time of writing) does not fully support the use of TLS. By enabling both features, the metric reporting pod may not work as expected. See Redis Metrics Exporter issue [387](https://github.com/oliver006/redis_exporter/issues/387) for more information.
+
 ### Sidecars and Init Containers
 
 If you have a need for additional containers to run within the same pod as Redis (e.g. an additional metrics or logging exporter), you can do so via the `sidecars` config parameter. Simply define your container according to the Kubernetes container spec.

bitnami/redis-cluster/templates/NOTES.txt

@@ -29,7 +29,7 @@ To connect to your Redis server from outside the cluster check the following inf
     To connect to your database from outside the cluster execute the following commands:
 
     export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "redis-cluster.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-    redis-cli -c -h $SERVICE_IP -p {{ .Values.service.port }} {{- if .Values.usePassword }} -a $REDIS_PASSWORD{{ end }}
+    redis-cli -c -h $SERVICE_IP -p {{ .Values.service.port }} {{- if .Values.usePassword }} -a $REDIS_PASSWORD{{ end }}{{ if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }}
     {{- end }}
 
 {{- else }}
@@ -44,14 +44,30 @@ To connect to your Redis cluster:
 
 1. Run a Redis pod that you can use as a client:
 
+{{- if .Values.tls.enabled }}
+   kubectl run --namespace {{ .Release.Namespace }} {{ template "redis-cluster.fullname" . }}-client --restart='Never' --env REDIS_PASSWORD=$REDIS_PASSWORD --image {{ template "redis-cluster.image" . }} --command -- sleep infinity
+
+   Copy your TLS certificates to the pod:
+
+   kubectl cp --namespace {{ .Release.Namespace }} /path/to/client.cert {{ template "redis-cluster.fullname" . }}-client:/tmp/client.cert
+   kubectl cp --namespace {{ .Release.Namespace }} /path/to/client.key {{ template "redis-cluster.fullname" . }}-client:/tmp/client.key
+   kubectl cp --namespace {{ .Release.Namespace }} /path/to/CA.cert {{ template "redis-cluster.fullname" . }}-client:/tmp/CA.cert
+
+   Use the following command to attach to the pod:
+
+   kubectl exec --tty -i {{ template "redis-cluster.fullname" . }}-client \
+   {{- if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }}--labels="{{ template "redis-cluster.fullname" . }}-client=true" \{{- end }}
+   --namespace {{ .Release.Namespace }} -- bash
+{{- else }}
 kubectl run --namespace {{ .Release.Namespace }} {{ template "redis-cluster.fullname" . }}-client --rm --tty -i --restart='Never' \
 {{ if .Values.usePassword }} --env REDIS_PASSWORD=$REDIS_PASSWORD \{{ end }}
 {{- if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }}--labels="{{ template "redis-cluster.fullname" . }}-client=true" \{{- end }}
 --image {{ template "redis-cluster.image" . }} -- bash
+{{- end }}
 
 2. Connect using the Redis CLI:
 
-redis-cli -c -h {{ template "redis-cluster.fullname" . }}{{ if .Values.usePassword }} -a $REDIS_PASSWORD{{ end }}
+redis-cli -c -h {{ template "redis-cluster.fullname" . }}{{ if .Values.usePassword }} -a $REDIS_PASSWORD{{ end }}{{ if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }}
 
 {{ if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }}
 Note: Since NetworkPolicy is enabled, only pods with label

bitnami/redis-cluster/templates/_helpers.tpl

@@ -133,6 +133,36 @@ Also, we can't use a single if because lazy evaluation is not an option
 {{- end -}}
 {{- end -}}
 
+{{/*
+Return the path to the cert file.
+*/}}
+{{- define "redis-cluster.tlsCert" -}}
+{{- required "Certificate filename is required when TLS in enabled" .Values.tls.certFilename | printf "/opt/bitnami/redis/certs/%s" -}}
+{{- end -}}
+
+{{/*
+Return the path to the cert key file.
+*/}}
+{{- define "redis-cluster.tlsCertKey" -}}
+{{- required "Certificate Key filename is required when TLS in enabled" .Values.tls.certKeyFilename | printf "/opt/bitnami/redis/certs/%s" -}}
+{{- end -}}
+
+{{/*
+Return the path to the CA cert file.
+*/}}
+{{- define "redis-cluster.tlsCACert" -}}
+{{- required "Certificate CA filename is required when TLS in enabled" .Values.tls.certCAFilename | printf "/opt/bitnami/redis/certs/%s" -}}
+{{- end -}}
+
+{{/*
+Return the path to the DH params file.
+*/}}
+{{- define "redis-cluster.tlsDHParams" -}}
+{{- if .Values.tls.dhParamsFilename -}}
+{{- printf "/opt/bitnami/redis/certs/%s" .Values.tls.dhParamsFilename -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Create the name of the service account to use
 */}}

bitnami/redis-cluster/templates/configmap.yaml

@@ -136,6 +136,76 @@ data:
     # Redis default starting with Redis 3.2.1.
     tcp-keepalive 300
 
+    ################################# TLS/SSL #####################################
+
+    # By default, TLS/SSL is disabled. To enable it, the "tls-port" configuration
+    # directive can be used to define TLS-listening ports. To enable TLS on the
+    # default port, use:
+    #
+    # port 0
+    # tls-port 6379
+
+    # Configure a X.509 certificate and private key to use for authenticating the
+    # server to connected clients, masters or cluster peers.  These files should be
+    # PEM formatted.
+    #
+    # tls-cert-file redis.crt
+    # tls-key-file redis.key
+
+    # Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange:
+    #
+    # tls-dh-params-file redis.dh
+
+    # Configure a CA certificate(s) bundle or directory to authenticate TLS/SSL
+    # clients and peers.  Redis requires an explicit configuration of at least one
+    # of these, and will not implicitly use the system wide configuration.
+    #
+    # tls-ca-cert-file ca.crt
+    # tls-ca-cert-dir /etc/ssl/certs
+
+    # By default, clients (including replica servers) on a TLS port are required
+    # to authenticate using valid client side certificates.
+    #
+    # It is possible to disable authentication using this directive.
+    #
+    # tls-auth-clients no
+
+    # By default, a Redis replica does not attempt to establish a TLS connection
+    # with its master.
+    #
+    # Use the following directive to enable TLS on replication links.
+    #
+    # tls-replication yes
+
+    # By default, the Redis Cluster bus uses a plain TCP connection. To enable
+    # TLS for the bus protocol, use the following directive:
+    #
+    # tls-cluster yes
+
+    # Explicitly specify TLS versions to support. Allowed values are case insensitive
+    # and include "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" (OpenSSL >= 1.1.1) or
+    # any combination. To enable only TLSv1.2 and TLSv1.3, use:
+    #
+    # tls-protocols "TLSv1.2 TLSv1.3"
+
+    # Configure allowed ciphers.  See the ciphers(1ssl) manpage for more information
+    # about the syntax of this string.
+    #
+    # Note: this configuration applies only to <= TLSv1.2.
+    #
+    # tls-ciphers DEFAULT:!MEDIUM
+
+    # Configure allowed TLSv1.3 ciphersuites.  See the ciphers(1ssl) manpage for more
+    # information about the syntax of this string, and specifically for TLSv1.3
+    # ciphersuites.
+    #
+    # tls-ciphersuites TLS_CHACHA20_POLY1305_SHA256
+
+    # When choosing a cipher, use the server's preference instead of the client
+    # preference. By default, the server follows the client's preference.
+    #
+    # tls-prefer-server-ciphers yes
+
     ################################# GENERAL #####################################
 
     # By default Redis does not run as a daemon. Use 'yes' if you need it.
@@ -259,6 +329,19 @@ data:
     # The filename where to dump the DB
     dbfilename dump.rdb
 
+    # Remove RDB files used by replication in instances without persistence
+    # enabled. By default this option is disabled, however there are environments
+    # where for regulations or other security concerns, RDB files persisted on
+    # disk by masters in order to feed replicas, or stored on disk by replicas
+    # in order to load them for the initial synchronization, should be deleted
+    # ASAP. Note that this option ONLY WORKS in instances that have both AOF
+    # and RDB persistence disabled, otherwise is completely ignored.
+    #
+    # An alternative (and sometimes better) way to obtain the same effect is
+    # to use diskless replication on both master and replicas instances. However
+    # in the case of replicas, diskless is not always an option.
+    rdb-del-sync-files no
+
     # The working directory.
     #
     # The DB will be written inside this directory, with the filename specified
@@ -298,6 +381,17 @@ data:
     # refuse the replica request.
     #
     # masterauth <master-password>
+    #
+    # However this is not enough if you are using Redis ACLs (for Redis version
+    # 6 or greater), and the default user is not capable of running the PSYNC
+    # command and/or other commands needed for replication. In this case it's
+    # better to configure a special user to use with replication, and specify the
+    # masteruser configuration as such:
+    #
+    # masteruser <username>
+    #
+    # When masteruser is specified, the replica will authenticate against its
+    # master using the new AUTH form: AUTH <username> <password>.
 
     # When a replica loses its connection with the master, or when the replication
     # is still in progress, the replica can act in two different ways:
@@ -332,13 +426,11 @@ data:
 
     # Replication SYNC strategy: disk or socket.
     #
-    # -------------------------------------------------------
-    # WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY
-    # -------------------------------------------------------
+    # New replicas and reconnecting replicas that are not able to continue the
+    # replication process just receiving differences, need to do what is called a
+    # "full synchronization". An RDB file is transmitted from the master to the
+    # replicas.
     #
-    # New replicas and reconnecting replicas that are not able to continue the replication
-    # process just receiving differences, need to do what is called a "full
-    # synchronization". An RDB file is transmitted from the master to the replicas.
     # The transmission can happen in two different ways:
     #
     # 1) Disk-backed: The Redis master creates a new process that writes the RDB
@@ -348,14 +440,14 @@ data:
     #              RDB file to replica sockets, without touching the disk at all.
     #
     # With disk-backed replication, while the RDB file is generated, more replicas
-    # can be queued and served with the RDB file as soon as the current child producing
-    # the RDB file finishes its work. With diskless replication instead once
-    # the transfer starts, new replicas arriving will be queued and a new transfer
-    # will start when the current one terminates.
+    # can be queued and served with the RDB file as soon as the current child
+    # producing the RDB file finishes its work. With diskless replication instead
+    # once the transfer starts, new replicas arriving will be queued and a new
+    # transfer will start when the current one terminates.
     #
     # When diskless replication is used, the master waits a configurable amount of
-    # time (in seconds) before starting the transfer in the hope that multiple replicas
-    # will arrive and the transfer can be parallelized.
+    # time (in seconds) before starting the transfer in the hope that multiple
+    # replicas will arrive and the transfer can be parallelized.
     #
     # With slow disks and fast (large bandwidth) networks, diskless replication
     # works better.
@@ -366,16 +458,42 @@ data:
     # to the replicas.
     #
     # This is important since once the transfer starts, it is not possible to serve
-    # new replicas arriving, that will be queued for the next RDB transfer, so the server
-    # waits a delay in order to let more replicas arrive.
+    # new replicas arriving, that will be queued for the next RDB transfer, so the
+    # server waits a delay in order to let more replicas arrive.
     #
     # The delay is specified in seconds, and by default is 5 seconds. To disable
     # it entirely just set it to 0 seconds and the transfer will start ASAP.
     repl-diskless-sync-delay 5
 
-    # Replicas send PINGs to server in a predefined interval. It's possible to change
-    # this interval with the repl_ping_replica_period option. The default value is 10
-    # seconds.
+    # -----------------------------------------------------------------------------
+    # WARNING: RDB diskless load is experimental. Since in this setup the replica
+    # does not immediately store an RDB on disk, it may cause data loss during
+    # failovers. RDB diskless load + Redis modules not handling I/O reads may also
+    # cause Redis to abort in case of I/O errors during the initial synchronization
+    # stage with the master. Use only if your do what you are doing.
+    # -----------------------------------------------------------------------------
+    #
+    # Replica can load the RDB it reads from the replication link directly from the
+    # socket, or store the RDB to a file and read that file after it was completely
+    # recived from the master.
+    #
+    # In many cases the disk is slower than the network, and storing and loading
+    # the RDB file may increase replication time (and even increase the master's
+    # Copy on Write memory and salve buffers).
+    # However, parsing the RDB file directly from the socket may mean that we have
+    # to flush the contents of the current database before the full rdb was
+    # received. For this reason we have the following options:
+    #
+    # "disabled"    - Don't use diskless load (store the rdb file to the disk first)
+    # "on-empty-db" - Use diskless load only when it is completely safe.
+    # "swapdb"      - Keep a copy of the current db contents in RAM while parsing
+    #                 the data directly from the socket. note that this requires
+    #                 sufficient memory, if you don't have it, you risk an OOM kill.
+    repl-diskless-load disabled
+
+    # Replicas send PINGs to server in a predefined interval. It's possible to
+    # change this interval with the repl_ping_replica_period option. The default
+    # value is 10 seconds.
     #
     # repl-ping-replica-period 10
 
@@ -407,10 +525,10 @@ data:
     repl-disable-tcp-nodelay no
 
     # Set the replication backlog size. The backlog is a buffer that accumulates
-    # replica data when replicas are disconnected for some time, so that when a replica
-    # wants to reconnect again, often a full resync is not needed, but a partial
-    # resync is enough, just passing the portion of data the replica missed while
-    # disconnected.
+    # replica data when replicas are disconnected for some time, so that when a
+    # replica wants to reconnect again, often a full resync is not needed, but a
+    # partial resync is enough, just passing the portion of data the replica
+    # missed while disconnected.
     #
     # The bigger the replication backlog, the longer the time the replica can be
     # disconnected and later be able to perform a partial resynchronization.
@@ -432,13 +550,13 @@ data:
     #
     # repl-backlog-ttl 3600
 
-    # The replica priority is an integer number published by Redis in the INFO output.
-    # It is used by Redis Sentinel in order to select a replica to promote into a
-    # master if the master is no longer working correctly.
+    # The replica priority is an integer number published by Redis in the INFO
+    # output. It is used by Redis Sentinel in order to select a replica to promote
+    # into a master if the master is no longer working correctly.
     #
     # A replica with a low priority number is considered better for promotion, so
-    # for instance if there are three replicas with priority 10, 100, 25 Sentinel will
-    # pick the one with priority 10, that is the lowest.
+    # for instance if there are three replicas with priority 10, 100, 25 Sentinel
+    # will pick the one with priority 10, that is the lowest.
     #
     # However a special priority of 0 marks the replica as not able to perform the
     # role of master, so a replica with priority of 0 will never be selected by
@@ -498,22 +616,174 @@ data:
     # replica-announce-ip 5.5.5.5
     # replica-announce-port 1234
 
+    ############################### KEYS TRACKING #################################
+
+    # Redis implements server assisted support for client side caching of values.
+    # This is implemented using an invalidation table that remembers, using
+    # 16 millions of slots, what clients may have certain subsets of keys. In turn
+    # this is used in order to send invalidation messages to clients. Please
+    # to understand more about the feature check this page:
+    #
+    #   https://redis.io/topics/client-side-caching
+    #
+    # When tracking is enabled for a client, all the read only queries are assumed
+    # to be cached: this will force Redis to store information in the invalidation
+    # table. When keys are modified, such information is flushed away, and
+    # invalidation messages are sent to the clients. However if the workload is
+    # heavily dominated by reads, Redis could use more and more memory in order
+    # to track the keys fetched by many clients.
+    #
+    # For this reason it is possible to configure a maximum fill value for the
+    # invalidation table. By default it is set to 1M of keys, and once this limit
+    # is reached, Redis will start to evict keys in the invalidation table
+    # even if they were not modified, just to reclaim memory: this will in turn
+    # force the clients to invalidate the cached values. Basically the table
+    # maximum size is a trade off between the memory you want to spend server
+    # side to track information about who cached what, and the ability of clients
+    # to retain cached objects in memory.
+    #
+    # If you set the value to 0, it means there are no limits, and Redis will
+    # retain as many keys as needed in the invalidation table.
+    # In the "stats" INFO section, you can find information about the number of
+    # keys in the invalidation table at every given moment.
+    #
+    # Note: when key tracking is used in broadcasting mode, no memory is used
+    # in the server side so this setting is useless.
+    #
+    # tracking-table-max-keys 1000000
+
     ################################## SECURITY ###################################
 
-    # Require clients to issue AUTH <PASSWORD> before processing any other
-    # commands.  This might be useful in environments in which you do not trust
-    # others with access to the host running redis-server.
-    #
-    # This should stay commented out for backward compatibility and because most
-    # people do not need auth (e.g. they run their own servers).
-    #
     # Warning: since Redis is pretty fast an outside user can try up to
-    # 150k passwords per second against a good box. This means that you should
-    # use a very strong password otherwise it will be very easy to break.
+    # 1 million passwords per second against a modern box. This means that you
+    # should use very strong passwords, otherwise they will be very easy to break.
+    # Note that because the password is really a shared secret between the client
+    # and the server, and should not be memorized by any human, the password
+    # can be easily a long string from /dev/urandom or whatever, so by using a
+    # long and unguessable password no brute force attack will be possible.
+
+    # Redis ACL users are defined in the following format:
+    #
+    #   user <username> ... acl rules ...
+    #
+    # For example:
+    #
+    #   user worker +@list +@connection ~jobs:* on >ffa9203c493aa99
+    #
+    # The special username "default" is used for new connections. If this user
+    # has the "nopass" rule, then new connections will be immediately authenticated
+    # as the "default" user without the need of any password provided via the
+    # AUTH command. Otherwise if the "default" user is not flagged with "nopass"
+    # the connections will start in not authenticated state, and will require
+    # AUTH (or the HELLO command AUTH option) in order to be authenticated and
+    # start to work.
+    #
+    # The ACL rules that describe what an user can do are the following:
+    #
+    #  on           Enable the user: it is possible to authenticate as this user.
+    #  off          Disable the user: it's no longer possible to authenticate
+    #               with this user, however the already authenticated connections
+    #               will still work.
+    #  +<command>   Allow the execution of that command
+    #  -<command>   Disallow the execution of that command
+    #  +@<category> Allow the execution of all the commands in such category
+    #               with valid categories are like @admin, @set, @sortedset, ...
+    #               and so forth, see the full list in the server.c file where
+    #               the Redis command table is described and defined.
+    #               The special category @all means all the commands, but currently
+    #               present in the server, and that will be loaded in the future
+    #               via modules.
+    #  +<command>|subcommand    Allow a specific subcommand of an otherwise
+    #                           disabled command. Note that this form is not
+    #                           allowed as negative like -DEBUG|SEGFAULT, but
+    #                           only additive starting with "+".
+    #  allcommands  Alias for +@all. Note that it implies the ability to execute
+    #               all the future commands loaded via the modules system.
+    #  nocommands   Alias for -@all.
+    #  ~<pattern>   Add a pattern of keys that can be mentioned as part of
+    #               commands. For instance ~* allows all the keys. The pattern
+    #               is a glob-style pattern like the one of KEYS.
+    #               It is possible to specify multiple patterns.
+    #  allkeys      Alias for ~*
+    #  resetkeys    Flush the list of allowed keys patterns.
+    #  ><password>  Add this passowrd to the list of valid password for the user.
+    #               For example >mypass will add "mypass" to the list.
+    #               This directive clears the "nopass" flag (see later).
+    #  <<password>  Remove this password from the list of valid passwords.
+    #  nopass       All the set passwords of the user are removed, and the user
+    #               is flagged as requiring no password: it means that every
+    #               password will work against this user. If this directive is
+    #               used for the default user, every new connection will be
+    #               immediately authenticated with the default user without
+    #               any explicit AUTH command required. Note that the "resetpass"
+    #               directive will clear this condition.
+    #  resetpass    Flush the list of allowed passwords. Moreover removes the
+    #               "nopass" status. After "resetpass" the user has no associated
+    #               passwords and there is no way to authenticate without adding
+    #               some password (or setting it as "nopass" later).
+    #  reset        Performs the following actions: resetpass, resetkeys, off,
+    #               -@all. The user returns to the same state it has immediately
+    #               after its creation.
+    #
+    # ACL rules can be specified in any order: for instance you can start with
+    # passwords, then flags, or key patterns. However note that the additive
+    # and subtractive rules will CHANGE MEANING depending on the ordering.
+    # For instance see the following example:
+    #
+    #   user alice on +@all -DEBUG ~* >somepassword
+    #
+    # This will allow "alice" to use all the commands with the exception of the
+    # DEBUG command, since +@all added all the commands to the set of the commands
+    # alice can use, and later DEBUG was removed. However if we invert the order
+    # of two ACL rules the result will be different:
+    #
+    #   user alice on -DEBUG +@all ~* >somepassword
+    #
+    # Now DEBUG was removed when alice had yet no commands in the set of allowed
+    # commands, later all the commands are added, so the user will be able to
+    # execute everything.
+    #
+    # Basically ACL rules are processed left-to-right.
+    #
+    # For more information about ACL configuration please refer to
+    # the Redis web site at https://redis.io/topics/acl
+
+    # ACL LOG
+    #
+    # The ACL Log tracks failed commands and authentication events associated
+    # with ACLs. The ACL Log is useful to troubleshoot failed commands blocked
+    # by ACLs. The ACL Log is stored in and consumes memory. There is no limit
+    # to its length.You can reclaim memory with ACL LOG RESET or set a maximum
+    # length below.
+    acllog-max-len 128
+
+    # Using an external ACL file
+    #
+    # Instead of configuring users here in this file, it is possible to use
+    # a stand-alone file just listing users. The two methods cannot be mixed:
+    # if you configure users here and at the same time you activate the exteranl
+    # ACL file, the server will refuse to start.
+    #
+    # The format of the external ACL user file is exactly the same as the
+    # format that is used inside redis.conf to describe users.
+    #
+    # aclfile /etc/redis/users.acl
+
+    # IMPORTANT NOTE: starting with Redis 6 "requirepass" is just a compatiblity
+    # layer on top of the new ACL system. The option effect will be just setting
+    # the password for the default user. Clients will still authenticate using
+    # AUTH <password> as usually, or more explicitly with AUTH default <password>
+    # if they follow the new protocol: both will work.
     #
     # requirepass foobared
 
-    # Command renaming.
+    # Command renaming (DEPRECATED).
+    #
+    # ------------------------------------------------------------------------
+    # WARNING: avoid using this option if possible. Instead use ACLs to remove
+    # commands from the default user, and put them only in some admin user you
+    # create for administrative purposes.
+    # ------------------------------------------------------------------------
     #
     # It is possible to change the name of dangerous commands in a shared
     # environment. For instance the CONFIG command may be renamed into something
@@ -573,13 +843,13 @@ data:
     # maxmemory <bytes>
 
     # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
-    # is reached. You can select among five behaviors:
+    # is reached. You can select one from the following behaviors:
     #
-    # volatile-lru -> Evict using approximated LRU among the keys with an expire set.
+    # volatile-lru -> Evict using approximated LRU, only keys with an expire set.
     # allkeys-lru -> Evict any key using approximated LRU.
-    # volatile-lfu -> Evict using approximated LFU among the keys with an expire set.
+    # volatile-lfu -> Evict using approximated LFU, only keys with an expire set.
     # allkeys-lfu -> Evict any key using approximated LFU.
-    # volatile-random -> Remove a random key among the ones with an expire set.
+    # volatile-random -> Remove a random key having an expire set.
     # allkeys-random -> Remove a random key, any key.
     # volatile-ttl -> Remove the key with the nearest expire time (minor TTL)
     # noeviction -> Don't evict anything, just return an error on write operations.
@@ -620,20 +890,37 @@ data:
     # DEL commands to the replica as keys evict in the master side.
     #
     # This behavior ensures that masters and replicas stay consistent, and is usually
-    # what you want, however if your replica is writable, or you want the replica to have
-    # a different memory setting, and you are sure all the writes performed to the
-    # replica are idempotent, then you may change this default (but be sure to understand
-    # what you are doing).
+    # what you want, however if your replica is writable, or you want the replica
+    # to have a different memory setting, and you are sure all the writes performed
+    # to the replica are idempotent, then you may change this default (but be sure
+    # to understand what you are doing).
     #
     # Note that since the replica by default does not evict, it may end using more
     # memory than the one set via maxmemory (there are certain buffers that may
-    # be larger on the replica, or data structures may sometimes take more memory and so
-    # forth). So make sure you monitor your replicas and make sure they have enough
-    # memory to never hit a real out-of-memory condition before the master hits
-    # the configured maxmemory setting.
+    # be larger on the replica, or data structures may sometimes take more memory
+    # and so forth). So make sure you monitor your replicas and make sure they
+    # have enough memory to never hit a real out-of-memory condition before the
+    # master hits the configured maxmemory setting.
     #
     # replica-ignore-maxmemory yes
 
+    # Redis reclaims expired keys in two ways: upon access when those keys are
+    # found to be expired, and also in background, in what is called the
+    # "active expire key". The key space is slowly and interactively scanned
+    # looking for expired keys to reclaim, so that it is possible to free memory
+    # of keys that are expired and will never be accessed again in a short time.
+    #
+    # The default effort of the expire cycle will try to avoid having more than
+    # ten percent of expired keys still in memory, and will try to avoid consuming
+    # more than 25% of total memory and to add latency to the system. However
+    # it is possible to increase the expire "effort" that is normally set to
+    # "1", to a greater value, up to the value "10". At its maximum value the
+    # system will use more CPU, longer cycles (and technically may introduce
+    # more latency), and will tollerate less already expired keys still present
+    # in the system. It's a tradeoff betweeen memory, CPU and latecy.
+    #
+    # active-expire-effort 1
+
     ############################# LAZY FREEING ####################################
 
     # Redis has two primitives to delete keys. One is called DEL and is a blocking
@@ -676,13 +963,66 @@ data:
     # In all the above cases the default is to delete objects in a blocking way,
     # like if DEL was called. However you can configure each case specifically
     # in order to instead release memory in a non-blocking way like if UNLINK
-    # was called, using the following configuration directives:
+    # was called, using the following configuration directives.
 
     lazyfree-lazy-eviction no
     lazyfree-lazy-expire no
     lazyfree-lazy-server-del no
     replica-lazy-flush no
 
+    # It is also possible, for the case when to replace the user code DEL calls
+    # with UNLINK calls is not easy, to modify the default behavior of the DEL
+    # command to act exactly like UNLINK, using the following configuration
+    # directive:
+
+    lazyfree-lazy-user-del no
+
+    ################################ THREADED I/O #################################
+
+    # Redis is mostly single threaded, however there are certain threaded
+    # operations such as UNLINK, slow I/O accesses and other things that are
+    # performed on side threads.
+    #
+    # Now it is also possible to handle Redis clients socket reads and writes
+    # in different I/O threads. Since especially writing is so slow, normally
+    # Redis users use pipelining in order to speedup the Redis performances per
+    # core, and spawn multiple instances in order to scale more. Using I/O
+    # threads it is possible to easily speedup two times Redis without resorting
+    # to pipelining nor sharding of the instance.
+    #
+    # By default threading is disabled, we suggest enabling it only in machines
+    # that have at least 4 or more cores, leaving at least one spare core.
+    # Using more than 8 threads is unlikely to help much. We also recommend using
+    # threaded I/O only if you actually have performance problems, with Redis
+    # instances being able to use a quite big percentage of CPU time, otherwise
+    # there is no point in using this feature.
+    #
+    # So for instance if you have a four cores boxes, try to use 2 or 3 I/O
+    # threads, if you have a 8 cores, try to use 6 threads. In order to
+    # enable I/O threads use the following configuration directive:
+    #
+    # io-threads 4
+    #
+    # Setting io-threads to 1 will just use the main thread as usually.
+    # When I/O threads are enabled, we only use threads for writes, that is
+    # to thread the write(2) syscall and transfer the client buffers to the
+    # socket. However it is also possible to enable threading of reads and
+    # protocol parsing using the following configuration directive, by setting
+    # it to yes:
+    #
+    # io-threads-do-reads no
+    #
+    # Usually threading reads doesn't help much.
+    #
+    # NOTE 1: This configuration directive cannot be changed at runtime via
+    # CONFIG SET. Aso this feature currently does not work when SSL is
+    # enabled.
+    #
+    # NOTE 2: If you want to test the Redis speedup using redis-benchmark, make
+    # sure you also run the benchmark itself in threaded mode, using the
+    # --threads option to match the number of Redis theads, otherwise you'll not
+    # be able to notice the improvements.
+
     ############################## APPEND ONLY MODE ###############################
 
     # By default Redis asynchronously dumps the dataset on disk. This mode is
@@ -939,6 +1279,22 @@ data:
     #
     # cluster-replica-no-failover no
 
+    # This option, when set to yes, allows nodes to serve read traffic while the
+    # the cluster is in a down state, as long as it believes it owns the slots.
+    #
+    # This is useful for two cases.  The first case is for when an application
+    # doesn't require consistency of data during node failures or network partitions.
+    # One example of this is a cache, where as long as the node has the data it
+    # should be able to serve it.
+    #
+    # The second use case is for configurations that don't meet the recommended
+    # three shards but want to enable cluster mode and scale later. A
+    # master outage in a 1 or 2 shard configuration causes a read/write outage to the
+    # entire cluster without this option set, with it set there is only a write outage.
+    # Without a quorum of masters, slot ownership will not change automatically.
+    #
+    # cluster-allow-reads-when-down no
+
     # In order to setup your cluster make sure to read the documentation
     # available at http://redis.io web site.
 
@@ -1045,7 +1401,11 @@ data:
     #  z     Sorted set commands
     #  x     Expired events (events generated every time a key expires)
     #  e     Evicted events (events generated when a key is evicted for maxmemory)
-    #  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
+    #  t     Stream commands
+    #  m     Key-miss events (Note: It is not included in the 'A' class)
+    #  A     Alias for g$lshzxet, so that the "AKE" string means all the events
+    #        (Except key-miss events which are excluded from 'A' due to their
+    #         unique nature).
     #
     #  The "notify-keyspace-events" takes as argument a string that is composed
     #  of zero or multiple characters. The empty string means that notifications
@@ -1066,6 +1426,61 @@ data:
     #  specify at least one of K or E, no events will be delivered.
     notify-keyspace-events ""
 
+    ############################### GOPHER SERVER #################################
+
+    # Redis contains an implementation of the Gopher protocol, as specified in
+    # the RFC 1436 (https://www.ietf.org/rfc/rfc1436.txt).
+    #
+    # The Gopher protocol was very popular in the late '90s. It is an alternative
+    # to the web, and the implementation both server and client side is so simple
+    # that the Redis server has just 100 lines of code in order to implement this
+    # support.
+    #
+    # What do you do with Gopher nowadays? Well Gopher never *really* died, and
+    # lately there is a movement in order for the Gopher more hierarchical content
+    # composed of just plain text documents to be resurrected. Some want a simpler
+    # internet, others believe that the mainstream internet became too much
+    # controlled, and it's cool to create an alternative space for people that
+    # want a bit of fresh air.
+    #
+    # Anyway for the 10nth birthday of the Redis, we gave it the Gopher protocol
+    # as a gift.
+    #
+    # --- HOW IT WORKS? ---
+    #
+    # The Redis Gopher support uses the inline protocol of Redis, and specifically
+    # two kind of inline requests that were anyway illegal: an empty request
+    # or any request that starts with "/" (there are no Redis commands starting
+    # with such a slash). Normal RESP2/RESP3 requests are completely out of the
+    # path of the Gopher protocol implementation and are served as usually as well.
+    #
+    # If you open a connection to Redis when Gopher is enabled and send it
+    # a string like "/foo", if there is a key named "/foo" it is served via the
+    # Gopher protocol.
+    #
+    # In order to create a real Gopher "hole" (the name of a Gopher site in Gopher
+    # talking), you likely need a script like the following:
+    #
+    #   https://github.com/antirez/gopher2redis
+    #
+    # --- SECURITY WARNING ---
+    #
+    # If you plan to put Redis on the internet in a publicly accessible address
+    # to server Gopher pages MAKE SURE TO SET A PASSWORD to the instance.
+    # Once a password is set:
+    #
+    #   1. The Gopher server (when enabled, not by default) will still serve
+    #      content via Gopher.
+    #   2. However other commands cannot be called before the client will
+    #      authenticate.
+    #
+    # So use the 'requirepass' option to protect your instance.
+    #
+    # To enable Gopher support uncomment the following line and set
+    # the option from no (the default) to yes.
+    #
+    # gopher-enabled no
+
     ############################### ADVANCED CONFIG ###############################
 
     # Hashes are encoded using a memory efficient data structure when they have a
@@ -1240,7 +1655,7 @@ data:
     # offers, and enables by default, the ability to use an adaptive HZ value
     # which will temporary raise when there are many connected clients.
     #
-    # When dynamic HZ is enabled, the actual configured HZ will be used as
+    # When dynamic HZ is enabled, the actual configured HZ will be used
     # as a baseline, but multiples of the configured HZ value will be actually
     # used as needed once more clients are connected. In this way an idle
     # instance will use very little CPU time while a busy instance will be
@@ -1313,10 +1728,6 @@ data:
 
     ########################### ACTIVE DEFRAGMENTATION #######################
     #
-    # WARNING THIS FEATURE IS EXPERIMENTAL. However it was stress tested
-    # even in production and manually tested by multiple engineers for some
-    # time.
-    #
     # What is active defragmentation?
     # -------------------------------
     #
@@ -1356,7 +1767,7 @@ data:
     # a good idea to leave the defaults untouched.
 
     # Enabled active defragmentation
-    # activedefrag yes
+    # activedefrag no
 
     # Minimum amount of fragmentation waste to start active defrag
     # active-defrag-ignore-bytes 100mb
@@ -1367,15 +1778,45 @@ data:
     # Maximum percentage of fragmentation at which we use maximum effort
     # active-defrag-threshold-upper 100
 
-    # Minimal effort for defrag in CPU percentage
-    # active-defrag-cycle-min 5
+    # Minimal effort for defrag in CPU percentage, to be used when the lower
+    # threshold is reached
+    # active-defrag-cycle-min 1
 
-    # Maximal effort for defrag in CPU percentage
-    # active-defrag-cycle-max 75
+    # Maximal effort for defrag in CPU percentage, to be used when the upper
+    # threshold is reached
+    # active-defrag-cycle-max 25
 
     # Maximum number of set/hash/zset/list fields that will be processed from
     # the main dictionary scan
     # active-defrag-max-scan-fields 1000
+
+    # Jemalloc background thread for purging will be enabled by default
+    jemalloc-bg-thread yes
+
+    # It is possible to pin different threads and processes of Redis to specific
+    # CPUs in your system, in order to maximize the performances of the server.
+    # This is useful both in order to pin different Redis threads in different
+    # CPUs, but also in order to make sure that multiple Redis instances running
+    # in the same host will be pinned to different CPUs.
+    #
+    # Normally you can do this using the "taskset" command, however it is also
+    # possible to this via Redis configuration directly, both in Linux and FreeBSD.
+    #
+    # You can pin the server/IO threads, bio threads, aof rewrite child process, and
+    # the bgsave child process. The syntax to specify the cpu list is the same as
+    # the taskset command:
+    #
+    # Set redis server/io threads to cpu affinity 0,2,4,6:
+    # server_cpulist 0-7:2
+    #
+    # Set bio threads to cpu affinity 1,3:
+    # bio_cpulist 1,3
+    #
+    # Set aof rewrite child process to cpu affinity 8,9,10,11:
+    # aof_rewrite_cpulist 8-11
+    #
+    # Set bgsave child process to cpu affinity 1,10,11
+    # bgsave_cpulist 1,10-11
 {{- if .Values.configmap }}
 {{- include "common.tplvalues.render" (dict "value" .Values.configmap "context" $) | nindent 4 }}
 {{- end }}

bitnami/redis-cluster/templates/init-cluster.yaml

@@ -27,11 +27,35 @@ spec:
               /entrypoint.sh /run.sh
           {{- end }}
           env:
+            - name: REDIS_TLS_ENABLED
+              value: {{ ternary "yes" "no" .Values.tls.enabled | quote }}
+            {{- if .Values.tls.enabled }}
+            - name:  REDIS_TLS_AUTH_CLIENTS
+              value: {{ ternary "yes" "no" .Values.tls.authClients | quote }}
+            - name:  REDIS_TLS_CERT_FILE
+              value: {{ template "redis-cluster.tlsCert" . }}
+            - name:  REDIS_TLS_KEY_FILE
+              value: {{ template "redis-cluster.tlsCertKey" . }}
+            - name:  REDIS_TLS_CA_FILE
+              value: {{ template "redis-cluster.tlsCACert" . }}
+            {{- if .Values.tls.dhParamsFilename }}
+            - name:  REDIS_TLS_DH_PARAMS_FILE
+              value: {{ template "redis-cluster.tlsDHParams" . }}
+            {{- end }}
+            {{- end }}
             {{- if .Values.cluster.externalAccess.enabled }}
-            - name: REDIS_PORT
-              value: {{ .Values.cluster.externalAccess.service.port | quote }}
+            {{- if .Values.tls.enabled }}
+            - name: REDIS_TLS_PORT
             {{- else }}
             - name: REDIS_PORT
+            {{- end }}
+              value: {{ .Values.cluster.externalAccess.service.port | quote }}
+            {{- else }}
+            {{- if .Values.tls.enabled }}
+            - name: REDIS_TLS_PORT
+            {{- else }}
+            - name: REDIS_PORT
+            {{- end }}
               value: {{ .Values.redisPort | quote }}
             - name: REDIS_NODES
               value: "{{ $count := .Values.cluster.nodes | int }}{{ range $i, $v := until $count }}{{ include "redis-cluster.fullname" $ }}-{{ $i }}.{{ template "redis-cluster.fullname" $ }}-headless {{ end }}"
@@ -47,5 +71,17 @@ spec:
               value: "yes"
             - name: REDIS_CLUSTER_REPLICAS
               value: {{ .Values.cluster.replicas | quote }}
+          {{- if .Values.tls.enabled }}
+          volumeMounts:
+            - name: redis-certificates
+              mountPath: /opt/bitnami/redis/certs
+              readOnly: true
+          {{- end }}
       restartPolicy: OnFailure
+      {{- if .Values.tls.enabled }}
+      volumes:
+        - name: redis-certificates
+          secret:
+            secretName: {{ required "A secret containing the certificates for the TLS traffic is required when TLS in enabled" .Values.tls.certificatesSecret }}
+    {{- end }}
 {{- end }}

bitnami/redis-cluster/templates/redis-statefulset.yaml

@@ -123,8 +123,27 @@ spec:
             {{- end }}
             - name: REDIS_AOF_ENABLED
               value: {{ .Values.useAOFPersistence | quote }}
+            - name: REDIS_TLS_ENABLED
+              value: {{ ternary "yes" "no" .Values.tls.enabled | quote }}
+            {{- if .Values.tls.enabled }}
+            - name: REDIS_TLS_PORT
+              value: {{ .Values.redisPort | quote }}
+            - name:  REDIS_TLS_AUTH_CLIENTS
+              value: {{ ternary "yes" "no" .Values.tls.authClients | quote }}
+            - name:  REDIS_TLS_CERT_FILE
+              value: {{ template "redis-cluster.tlsCert" . }}
+            - name:  REDIS_TLS_KEY_FILE
+              value: {{ template "redis-cluster.tlsCertKey" . }}
+            - name:  REDIS_TLS_CA_FILE
+              value: {{ template "redis-cluster.tlsCACert" . }}
+            {{- if .Values.tls.dhParamsFilename }}
+            - name:  REDIS_TLS_DH_PARAMS_FILE
+              value: {{ template "redis-cluster.tlsDHParams" . }}
+            {{- end }}
+            {{- else }}
             - name: REDIS_PORT
               value: {{ .Values.redisPort | quote }}
+            {{- end }}
             {{- if .Values.extraEnvVars }}
             {{- include "common.tplvalues.render" ( dict "value" .Values.extraEnvVars "context" $ ) | nindent 8 }}
             {{- end }}
@@ -189,6 +208,11 @@ spec:
               subPath: redis-default.conf
             - name: redis-tmp-conf
               mountPath: /opt/bitnami/redis/etc/
+            {{- if .Values.tls.enabled }}
+            - name: redis-certificates
+              mountPath: /opt/bitnami/redis/certs
+              readOnly: true
+            {{- end }}
             {{- if .Values.extraVolumeMounts }}
             {{- include "common.tplvalues.render" ( dict "value" .Values.extraVolumeMounts "context" $ ) | nindent 8 }}
             {{- end }}
@@ -218,11 +242,22 @@ spec:
             - name: REDIS_PASSWORD_FILE
               value: "/opt/bitnami/redis/secrets/redis-password"
             {{- end }}
+            {{- if .Values.tls.enabled }}
+            - name: REDIS_EXPORTER_TLS_CLIENT_KEY_FILE
+              value: {{ template "redis-cluster.tlsCertKey" . }}
+            - name: REDIS_EXPORTER_TLS_CLIENT_CERT_FILE
+              value: {{ template "redis-cluster.tlsCert" . }}
+            {{- end }}
           volumeMounts:
             {{- if .Values.usePasswordFile }}
             - name: redis-password
               mountPath: /opt/bitnami/redis/secrets/
             {{- end }}
+            {{- if .Values.tls.enabled }}
+            - name: redis-certificates
+              mountPath: /opt/bitnami/redis/certs
+              readOnly: true
+            {{- end }}
           ports:
             - name: http-metrics
               containerPort: 9121
@@ -300,6 +335,12 @@ spec:
         {{- if .Values.extraVolumes }}
         {{- include "common.tplvalues.render" ( dict "value" .Values.extraVolumes "context" $ ) | nindent 6 }}
         {{- end }}
+        {{- if .Values.tls.enabled }}
+        - name: redis-certificates
+          secret:
+            secretName: {{ required "A secret containing the certificates for the TLS traffic is required when TLS in enabled" .Values.tls.certificatesSecret }}
+            defaultMode: 256
+        {{- end }}
   {{- if .Values.persistence.enabled }}
   volumeClaimTemplates:
     - metadata:

bitnami/redis-cluster/templates/scripts-configmap.yaml

@@ -15,7 +15,15 @@ data:
       timeout -s 9 $1 \
       redis-cli \
         -h localhost \
+{{- if .Values.tls.enabled }}
+        -p $REDIS_TLS_PORT \
+        --tls \
+        --cert {{ template "redis-cluster.tlsCert" . }} \
+        --key {{ template "redis-cluster.tlsCertKey" . }} \
+        --cacert {{ template "redis-cluster.tlsCACert" . }} \
+{{- else }}
         -p $REDIS_PORT \
+{{- end }}
         ping
     )
     if [ "$response" != "PONG" ]; then
@@ -33,7 +41,15 @@ data:
       timeout -s 9 $1 \
       redis-cli \
         -h localhost \
+{{- if .Values.tls.enabled }}
+        -p $REDIS_TLS_PORT \
+        --tls \
+        --cert {{ template "redis-cluster.tlsCert" . }} \
+        --key {{ template "redis-cluster.tlsCertKey" . }} \
+        --cacert {{ template "redis-cluster.tlsCACert" . }} \
+{{- else }}
         -p $REDIS_PORT \
+{{- end }}
         ping
     )
     if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then

bitnami/redis-cluster/templates/update-cluster.yaml

@@ -25,30 +25,54 @@ spec:
               . /opt/bitnami/scripts/libos.sh
               {{- if .Values.cluster.externalAccess.enabled }}
               for nodeIp in $(echo "{{ .Values.cluster.update.newExternalIPs }}" | cut -d [ -f2 | cut -d ] -f 1 ); do
+                {{- if .Values.tls.enabled }}
+                while [[ $(redis-cli -h "$nodeIp" -p "$REDIS_TLS_PORT" --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} ping) != 'PONG' ]]; do
+                {{- else }}
                 while [[ $(redis-cli -h "$nodeIp" -p "$REDIS_PORT" ping) != 'PONG' ]]; do
+                {{- end }}
                   echo "Node $nodeIp not ready, waiting for all the nodes to be ready..."
                   sleep 5
                 done
+                {{- if .Values.tls.enabled }}
+                redis-cli --cluster --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} add-node "${nodeIp}:${REDIS_TLS_PORT}" "{{ index .Values.cluster.externalAccess.service.loadBalancerIP 0 }}:${REDIS_TLS_PORT}"
+                {{- else }}
                 redis-cli --cluster add-node "${nodeIp}:${REDIS_PORT}" "{{ index .Values.cluster.externalAccess.service.loadBalancerIP 0 }}:${REDIS_PORT}"
+                {{- end }}
               done
               {{- else }}
               for node in $(seq $((1+{{ .Values.cluster.update.currentNumberOfNodes }})) {{ .Values.cluster.nodes }}); do
                 new_node_index="$(($node - 1))"
                 new_node_ip=$(wait_for_dns_lookup {{ template "redis-cluster.fullname" . }}-"$new_node_index".{{ template "redis-cluster.fullname" . }}-headless 120 5)
+                {{- if .Values.tls.enabled }}
+                while [[ $(redis-cli -h "$new_node_ip" -p "$REDIS_TLS_PORT" --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} ping) != 'PONG' ]]; do
+                {{- else }}
                 while [[ $(redis-cli -h "$new_node_ip" -p "$REDIS_PORT" ping) != 'PONG' ]]; do
+                {{- end }}
                   echo "Node $new_node_ip not ready, waiting for all the nodes to be ready..."
                   sleep 5
                 done
                 firstNodeIp=$(wait_for_dns_lookup {{ template "redis-cluster.fullname" . }}-0.{{ template "redis-cluster.fullname" . }}-headless 120 5)
+                {{- if .Values.tls.enabled }}
+                redis-cli --cluster add-node --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} "${new_node_ip}:${REDIS_TLS_PORT}" "${firstNodeIp}:${REDIS_TLS_PORT}"
+                {{- else }}
                 redis-cli --cluster add-node "${new_node_ip}:${REDIS_PORT}" "${firstNodeIp}:${REDIS_PORT}"
+                {{- end }}
               done
               {{- end }}
           env:
             {{- if .Values.cluster.externalAccess.enabled }}
-            - name: REDIS_PORT
-              value: {{ .Values.cluster.externalAccess.service.port | quote }}
+            {{- if .Values.tls.enabled }}
+            - name: REDIS_TLS_PORT
             {{- else }}
             - name: REDIS_PORT
+            {{- end }}
+              value: {{ .Values.cluster.externalAccess.service.port | quote }}
+            {{- else }}
+            {{- if .Values.tls.enabled }}
+            - name: REDIS_TLS_PORT
+            {{- else }}
+            - name: REDIS_PORT
+            {{- end }}
               value: {{ .Values.redisPort | quote }}
             {{- end }}
             {{- if .Values.usePassword }}
@@ -58,5 +82,15 @@ spec:
                   name: {{ template "redis-cluster.secretName" . }}
                   key: {{ template "redis-cluster.secretPasswordKey" . }}
             {{- end }}
+          volumeMounts:
+            - name: redis-certificates
+              mountPath: /opt/bitnami/redis/certs
+              readOnly: true
       restartPolicy: OnFailure
+      {{- if .Values.tls.enabled }}
+      volumes:
+        - name: redis-certificates
+          secret:
+            secretName: {{ required "A secret containing the certificates for the TLS traffic is required when TLS in enabled" .Values.tls.certificatesSecret }}
+    {{- end }}
 {{- end }}

bitnami/redis-cluster/values-production.yaml

@@ -18,7 +18,7 @@ image:
   ## Bitnami Redis image tag
   ## ref: https://github.com/bitnami/bitnami-docker-redis#supported-tags-and-respective-dockerfile-links
   ##
-  tag: 6.0.5-debian-10-r0
+  tag: 6.0.5-debian-10-r1
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -199,6 +199,31 @@ useAOFPersistence: "yes"
 # Redis port
 redisPort: 6379
 
+##
+## TLS configuration
+##
+tls:
+  # Enable TLS traffic
+  enabled: false
+  #
+  # Whether to require clients to authenticate or not.
+  authClients: true
+  #
+  # Name of the Secret that contains the certificates
+  certificatesSecret:
+  #
+  # Certificate filename
+  certFilename:
+  #
+  # Certificate Key filename
+  certKeyFilename:
+  #
+  # CA Certificate filename
+  certCAFilename:
+  #
+  # File containing DH params (in order to support DH based ciphers)
+  # dhParamsFilename:
+
 ##
 ## Redis parameters
 ##

bitnami/redis-cluster/values.yaml

@@ -18,7 +18,7 @@ image:
   ## Bitnami Redis image tag
   ## ref: https://github.com/bitnami/bitnami-docker-redis#supported-tags-and-respective-dockerfile-links
   ##
-  tag: 6.0.5-debian-10-r0
+  tag: 6.0.5-debian-10-r1
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -199,6 +199,31 @@ useAOFPersistence: "yes"
 # Redis port
 redisPort: 6379
 
+##
+## TLS configuration
+##
+tls:
+  # Enable TLS traffic
+  enabled: false
+  #
+  # Whether to require clients to authenticate or not.
+  authClients: true
+  #
+  # Name of the Secret that contains the certificates
+  certificatesSecret:
+  #
+  # Certificate filename
+  certFilename:
+  #
+  # Certificate Key filename
+  certKeyFilename:
+  #
+  # CA Certificate filename
+  certCAFilename:
+  #
+  # File containing DH params (in order to support DH based ciphers)
+  # dhParamsFilename:
+
 ##
 ## Redis parameters
 ##