[bitnami/redis] Fix: external master host, disabling external access, configuration of replica when redis on the same k8s node and exposed outside by HostIP

bitnami/redis/Chart.yaml

@@ -22,4 +22,4 @@ maintainers:
 name: redis
 sources:
   - https://github.com/bitnami/charts/tree/main/bitnami/redis
-version: 17.11.3
+version: 17.12.0

bitnami/redis/README.md

@@ -356,7 +356,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `sentinel.extraEnvVarsSecret`                 | Name of existing Secret containing extra env vars for Redis® Sentinel nodes                                                             | `""`                     |
 | `sentinel.externalMaster.enabled`             | Use external master for bootstrapping                                                                                                       | `false`                  |
 | `sentinel.externalMaster.host`                | External master host to bootstrap from                                                                                                      | `""`                     |
-| `sentinel.externalMaster.port`                | Port for Redis service external master host                                                                                                 | `6379`                   |
+| `sentinel.externalMaster.port`                | Port for Redis service external master host                                                                                                 | `26379`                  |
 | `sentinel.containerPorts.sentinel`            | Container port to open on Redis® Sentinel nodes                                                                                         | `26379`                  |
 | `sentinel.startupProbe.enabled`               | Enable startupProbe on Redis® Sentinel nodes                                                                                            | `true`                   |
 | `sentinel.startupProbe.initialDelaySeconds`   | Initial delay seconds for startupProbe                                                                                                      | `10`                     |
@@ -949,4 +949,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.

bitnami/redis/templates/scripts-configmap.yaml

@@ -26,7 +26,12 @@ data:
         port_var=$(echo "${hostname^^}_SERVICE_PORT_$type" | sed "s/-/_/g")
         port=${!port_var}
 
-        if [ -z "$port" ]; then
+        {{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled }}
+        if [[ -z "$port" ]] || [[ {{ .Values.sentinel.service.type | quote }} == "ClusterIP" ]]
+        {{- else }}
+        if [[ -z "$port" ]]
+        {{- end }}
+        then
             case $type in
                 "SENTINEL")
                     echo {{ .Values.sentinel.containerPorts.sentinel }}
@@ -71,13 +76,14 @@ data:
 
     HEADLESS_SERVICE="{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}"
 
-    if [ -n "$REDIS_EXTERNAL_MASTER_HOST" ]; then
-        REDIS_SERVICE="$REDIS_EXTERNAL_MASTER_HOST"
-    else
+    {{- if .Values.sentinel.externalMaster.enabled }}
+        REDIS_SERVICE={{ .Values.sentinel.externalMaster.host | quote }}
+        SENTINEL_SERVICE_PORT={{ .Values.sentinel.externalMaster.port | quote }}
+    {{- else }}
         REDIS_SERVICE="{{ template "common.names.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}"
-    fi
+        SENTINEL_SERVICE_PORT=$(get_port "{{ include "common.names.fullname" . }}" "SENTINEL")
+    {{- end }}
 
-    SENTINEL_SERVICE_PORT=$(get_port "{{ include "common.names.fullname" . }}" "SENTINEL")
     validate_quorum() {
         if is_boolean_yes "$REDIS_TLS_ENABLED"; then
             quorum_info_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} sentinel master {{ .Values.sentinel.masterSet }}"
@@ -153,7 +159,7 @@ data:
         REDIS_MASTER_HOST=${REDIS_SENTINEL_INFO[0]}
         REDIS_MASTER_PORT_NUMBER=${REDIS_SENTINEL_INFO[1]}
 
-        if [[ "$REDIS_MASTER_HOST" == "$(get_full_hostname "$HOSTNAME")" ]]; then
+        if [[ "$REDIS_MASTER_HOST" == "$(get_full_hostname "$HOSTNAME")" ]] && [[ "$REDIS_MASTER_PORT_NUMBER" == "$REDISPORT" ]]; then
             # Case 3: Active sentinel and master it is this node --> MASTER
             info "Configuring the node as master"
             export REDIS_REPLICATION_MODE="master"
@@ -182,10 +188,10 @@ data:
         fi
     fi
 
-    if [[ -n "$REDIS_EXTERNAL_MASTER_HOST" ]]; then
-      REDIS_MASTER_HOST="$REDIS_EXTERNAL_MASTER_HOST"
-      REDIS_MASTER_PORT_NUMBER="${REDIS_EXTERNAL_MASTER_PORT}"
-    fi
+    {{- if .Values.replica.externalMaster.enabled }}
+      REDIS_MASTER_HOST={{ .Values.replica.externalMaster.host | quote }}
+      REDIS_MASTER_PORT_NUMBER={{ .Values.replica.externalMaster.port | quote }}
+    {{- end }}
 
     if [[ -f /opt/bitnami/redis/mounted-etc/replica.conf ]];then
         cp /opt/bitnami/redis/mounted-etc/replica.conf /opt/bitnami/redis/etc/replica.conf
@@ -249,17 +255,15 @@ data:
     . /opt/bitnami/scripts/libvalidations.sh
     . /opt/bitnami/scripts/libfile.sh
 
-    HEADLESS_SERVICE="{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}"
-    REDIS_SERVICE="{{ template "common.names.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}"
-
     get_port() {
         hostname="$1"
         type="$2"
 
         port_var=$(echo "${hostname^^}_SERVICE_PORT_$type" | sed "s/-/_/g")
         port=${!port_var}
 
-        if [ -z "$port" ]; then
+        if [[ -z "$port" ]] || [[ {{ .Values.sentinel.service.type | quote }} == "ClusterIP" ]]
+        then
             case $type in
                 "SENTINEL")
                     echo {{ .Values.sentinel.containerPorts.sentinel }}
@@ -300,10 +304,6 @@ data:
         {{- end }}
     }
 
-    SERVPORT=$(get_port "$HOSTNAME" "SENTINEL")
-    REDISPORT=$(get_port "$HOSTNAME" "REDIS")
-    SENTINEL_SERVICE_PORT=$(get_port "{{ include "common.names.fullname" . }}" "SENTINEL")
-
     sentinel_conf_set() {
         local -r key="${1:?missing key}"
         local value="${2:-}"
@@ -332,6 +332,18 @@ data:
         eval $sentinel_info_command
     }
 
+    HEADLESS_SERVICE="{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}"
+    SERVPORT=$(get_port "$HOSTNAME" "SENTINEL")
+    REDISPORT=$(get_port "$HOSTNAME" "REDIS")
+
+    {{- if .Values.sentinel.externalMaster.enabled }}
+        REDIS_SERVICE={{ .Values.sentinel.externalMaster.host | quote }}
+        SENTINEL_SERVICE_PORT={{ .Values.sentinel.externalMaster.port | quote }}
+    {{- else }}
+        REDIS_SERVICE="{{ template "common.names.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}"
+        SENTINEL_SERVICE_PORT=$(get_port "{{ include "common.names.fullname" . }}" "SENTINEL")
+    {{- end }}
+
     [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")"
 
     master_in_persisted_conf="$(get_full_hostname "$HOSTNAME")"
@@ -364,11 +376,6 @@ data:
         REDIS_MASTER_PORT_NUMBER=${REDIS_SENTINEL_INFO[1]}
     fi
 
-    if [[ -n "$REDIS_EXTERNAL_MASTER_HOST" ]]; then
-      REDIS_MASTER_HOST="$REDIS_EXTERNAL_MASTER_HOST"
-      REDIS_MASTER_PORT_NUMBER="${REDIS_EXTERNAL_MASTER_PORT}"
-    fi
-
     cp /opt/bitnami/redis-sentinel/mounted-etc/sentinel.conf /opt/bitnami/redis-sentinel/etc/sentinel.conf
     {{- if .Values.auth.enabled }}
     printf "\nsentinel auth-pass %s %s" "{{ .Values.sentinel.masterSet }}" "$REDIS_PASSWORD" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf
@@ -654,7 +661,12 @@ data:
         port_var=$(echo "${hostname^^}_SERVICE_PORT_$type" | sed "s/-/_/g")
         port=${!port_var}
 
-        if [ -z "$port" ]; then
+        {{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled }}
+        if [[ -z "$port" ]] || [[ {{ .Values.sentinel.service.type | quote }} == "ClusterIP" ]]
+        {{- else }}
+        if [[ -z "$port" ]]
+        {{- end }}
+        then
             case $type in
                 "SENTINEL")
                     echo {{ .Values.sentinel.containerPorts.sentinel }}

bitnami/redis/templates/sentinel/statefulset.yaml

@@ -209,12 +209,6 @@ spec:
             {{- end }}
             - name: REDIS_DATA_DIR
               value: {{ .Values.replica.persistence.path }}
-            {{- if .Values.replica.externalMaster.enabled }}
-            - name:  REDIS_EXTERNAL_MASTER_HOST
-              value: {{ .Values.replica.externalMaster.host | quote }}
-            - name:  REDIS_EXTERNAL_MASTER_PORT
-              value: {{ .Values.replica.externalMaster.port | quote }}
-            {{- end }}
             {{- if .Values.replica.extraEnvVars }}
             {{- include "common.tplvalues.render" ( dict "value" .Values.replica.extraEnvVars "context" $ ) | nindent 12 }}
             {{- end }}
@@ -386,12 +380,6 @@ spec:
             - name: REDIS_SENTINEL_PORT
               value: {{ .Values.sentinel.containerPorts.sentinel | quote }}
             {{- end }}
-            {{- if .Values.sentinel.externalMaster.enabled }}
-            - name:  REDIS_EXTERNAL_MASTER_HOST
-              value: {{ .Values.sentinel.externalMaster.host | quote }}
-            - name:  REDIS_EXTERNAL_MASTER_PORT
-              value: {{ .Values.sentinel.externalMaster.port | quote }}
-            {{- end }}
             {{- if .Values.sentinel.extraEnvVars }}
             {{- include "common.tplvalues.render" ( dict "value" .Values.sentinel.extraEnvVars "context" $ ) | nindent 12 }}
             {{- end }}

bitnami/redis/values.yaml

@@ -1082,7 +1082,7 @@ sentinel:
   externalMaster:
     enabled: false
     host: ""
-    port: 6379
+    port: 26379
   ## @param sentinel.containerPorts.sentinel Container port to open on Redis® Sentinel nodes
   ##
   containerPorts: