Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-08-10 14:15:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/redis] Fix Redis sentinel synchronization and user creation permission error (#4820)

Browse Source 
* Fixed race condition for sentinel synchronization and missing nil check

* Added check for sentinel to add publishNotReadyAddresses

* Added missing nil check for non-sentinel deployment

* [bitnami/redis] Update components versions

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

Co-authored-by: Bitnami Containers <containers@bitnami.com>
This commit is contained in:
Berkay Tekin Öz
2021-01-05 16:13:03 +01:00
committed by GitHub
co-authored by Bitnami Containers
parent 2d3be4e547
commit a6c17cf6fa
5 changed files with 21 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitnami/redis/Chart.yaml
+1 -1
View File
@@ -19,4 +19,4 @@ name: redis
sources: sources:
- https://github.com/bitnami/bitnami-docker-redis - https://github.com/bitnami/bitnami-docker-redis
- http://redis.io/ - http://redis.io/
version: 12.3.1 version: 12.3.2
bitnami/redis/templates/configmap-scripts.yaml
+11 -35
View File
@@ -24,25 +24,14 @@ data:
} }
HEADLESS_SERVICE="{{ template "redis.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" HEADLESS_SERVICE="{{ template "redis.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}"
REDIS_SERVICE="{{ template "redis.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}"
export REDIS_REPLICATION_MODE="slave" export REDIS_REPLICATION_MODE="slave"
if [[ -z "$(getent ahosts "$HEADLESS_SERVICE" | grep -v "^$(hostname -i) ")" ]]; then if [[ -z "$(getent ahosts "$HEADLESS_SERVICE" | grep -v "^$(hostname -i) ")" ]]; then
if [[ ! -f /data/redisboot.lock ]]; then export REDIS_REPLICATION_MODE="master"
export REDIS_REPLICATION_MODE="master"
else
if is_boolean_yes "$REDIS_TLS_ENABLED"; then
sentinel_info_command="redis-cli {{- if .Values.usePassword }} -a $REDIS_PASSWORD {{- end }} -h $HEADLESS_SERVICE -p {{ .Values.sentinel.port }} --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} info"
else
sentinel_info_command="redis-cli {{- if .Values.usePassword }} -a $REDIS_PASSWORD {{- end }} -h $HEADLESS_SERVICE -p {{ .Values.sentinel.port }} info"
fi
if [[ ! ($($sentinel_info_command)) ]]; then
export REDIS_REPLICATION_MODE="master"
rm /data/redisboot.lock
fi
fi
fi fi
{{- if (eq (.Values.securityContext.runAsUser | int) 0) }} {{- if and .Values.securityContext.runAsUser (eq (.Values.securityContext.runAsUser | int) 0) }}
useradd redis useradd redis
chown -R redis {{ .Values.slave.persistence.path }} chown -R redis {{ .Values.slave.persistence.path }}
{{- end }} {{- end }}
@@ -68,9 +57,9 @@ data:
fi fi
if is_boolean_yes "$REDIS_TLS_ENABLED"; then if is_boolean_yes "$REDIS_TLS_ENABLED"; then
sentinel_info_command="redis-cli {{- if .Values.usePassword }} -a $REDIS_PASSWORD {{- end }} -h $HEADLESS_SERVICE -p {{ .Values.sentinel.port }} --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} sentinel get-master-addr-by-name {{ .Values.sentinel.masterSet }}" sentinel_info_command="redis-cli {{- if .Values.usePassword }} -a $REDIS_PASSWORD {{- end }} -h $REDIS_SERVICE -p {{ .Values.sentinel.port }} --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} sentinel get-master-addr-by-name {{ .Values.sentinel.masterSet }}"
else else
sentinel_info_command="redis-cli {{- if .Values.usePassword }} -a $REDIS_PASSWORD {{- end }} -h $HEADLESS_SERVICE -p {{ .Values.sentinel.port }} sentinel get-master-addr-by-name {{ .Values.sentinel.masterSet }}" sentinel_info_command="redis-cli {{- if .Values.usePassword }} -a $REDIS_PASSWORD {{- end }} -h $REDIS_SERVICE -p {{ .Values.sentinel.port }} sentinel get-master-addr-by-name {{ .Values.sentinel.masterSet }}"
fi fi
REDIS_SENTINEL_INFO=($($sentinel_info_command)) REDIS_SENTINEL_INFO=($($sentinel_info_command))
REDIS_MASTER_HOST=${REDIS_SENTINEL_INFO[0]} REDIS_MASTER_HOST=${REDIS_SENTINEL_INFO[0]}
@@ -136,7 +125,6 @@ data:
{{- end }} {{- end }}
{{- end }} {{- end }}
touch /data/redisboot.lock
{{- if .Values.slave.command }} {{- if .Values.slave.command }}
exec {{ .Values.slave.command }} "${ARGS[@]}" exec {{ .Values.slave.command }} "${ARGS[@]}"
{{- else }} {{- else }}
@@ -194,6 +182,7 @@ data:
} }
HEADLESS_SERVICE="{{ template "redis.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" HEADLESS_SERVICE="{{ template "redis.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}"
REDIS_SERVICE="{{ template "redis.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}"
if [[ -n $REDIS_PASSWORD_FILE ]]; then if [[ -n $REDIS_PASSWORD_FILE ]]; then
password_aux=`cat ${REDIS_PASSWORD_FILE}` password_aux=`cat ${REDIS_PASSWORD_FILE}`
@@ -215,19 +204,7 @@ data:
export REDIS_REPLICATION_MODE="slave" export REDIS_REPLICATION_MODE="slave"
if [[ -z "$(getent ahosts "$HEADLESS_SERVICE" | grep -v "^$(hostname -i) ")" ]]; then if [[ -z "$(getent ahosts "$HEADLESS_SERVICE" | grep -v "^$(hostname -i) ")" ]]; then
if [[ ! -f /data/sentinelboot.lock ]]; then export REDIS_REPLICATION_MODE="master"
export REDIS_REPLICATION_MODE="master"
else
if is_boolean_yes "$REDIS_SENTINEL_TLS_ENABLED"; then
sentinel_info_command="redis-cli {{- if .Values.usePassword }} -a $REDIS_PASSWORD {{- end }} -h $HEADLESS_SERVICE -p {{ .Values.sentinel.port }} --tls --cert ${REDIS_SENTINEL_TLS_CERT_FILE} --key ${REDIS_SENTINEL_TLS_KEY_FILE} --cacert ${REDIS_SENTINEL_TLS_CA_FILE} info"
else
sentinel_info_command="redis-cli {{- if .Values.usePassword }} -a $REDIS_PASSWORD {{- end }} -h $HEADLESS_SERVICE -p {{ .Values.sentinel.port }} info"
fi
if [[ ! ($($sentinel_info_command)) ]]; then
export REDIS_REPLICATION_MODE="master"
rm /data/sentinelboot.lock
fi
fi
fi fi
if [[ "$REDIS_REPLICATION_MODE" == "master" ]]; then if [[ "$REDIS_REPLICATION_MODE" == "master" ]]; then
@@ -235,9 +212,9 @@ data:
REDIS_MASTER_PORT_NUMBER="{{ .Values.redisPort }}" REDIS_MASTER_PORT_NUMBER="{{ .Values.redisPort }}"
else else
if is_boolean_yes "$REDIS_SENTINEL_TLS_ENABLED"; then if is_boolean_yes "$REDIS_SENTINEL_TLS_ENABLED"; then
sentinel_info_command="redis-cli {{- if .Values.usePassword }} -a $REDIS_PASSWORD {{- end }} -h $HEADLESS_SERVICE -p {{ .Values.sentinel.port }} --tls --cert ${REDIS_SENTINEL_TLS_CERT_FILE} --key ${REDIS_SENTINEL_TLS_KEY_FILE} --cacert ${REDIS_SENTINEL_TLS_CA_FILE} sentinel get-master-addr-by-name {{ .Values.sentinel.masterSet }}" sentinel_info_command="redis-cli {{- if .Values.usePassword }} -a $REDIS_PASSWORD {{- end }} -h $REDIS_SERVICE -p {{ .Values.sentinel.port }} --tls --cert ${REDIS_SENTINEL_TLS_CERT_FILE} --key ${REDIS_SENTINEL_TLS_KEY_FILE} --cacert ${REDIS_SENTINEL_TLS_CA_FILE} sentinel get-master-addr-by-name {{ .Values.sentinel.masterSet }}"
else else
sentinel_info_command="redis-cli {{- if .Values.usePassword }} -a $REDIS_PASSWORD {{- end }} -h $HEADLESS_SERVICE -p {{ .Values.sentinel.port }} sentinel get-master-addr-by-name {{ .Values.sentinel.masterSet }}" sentinel_info_command="redis-cli {{- if .Values.usePassword }} -a $REDIS_PASSWORD {{- end }} -h $REDIS_SERVICE -p {{ .Values.sentinel.port }} sentinel get-master-addr-by-name {{ .Values.sentinel.masterSet }}"
fi fi
REDIS_SENTINEL_INFO=($($sentinel_info_command)) REDIS_SENTINEL_INFO=($($sentinel_info_command))
REDIS_MASTER_HOST=${REDIS_SENTINEL_INFO[0]} REDIS_MASTER_HOST=${REDIS_SENTINEL_INFO[0]}
@@ -295,12 +272,11 @@ data:
ARGS+=("--tls-dh-params-file" "${REDIS_SENTINEL_TLS_DH_PARAMS_FILE}") ARGS+=("--tls-dh-params-file" "${REDIS_SENTINEL_TLS_DH_PARAMS_FILE}")
{{- end }} {{- end }}
{{- end }} {{- end }}
touch /data/sentinelboot.lock
exec redis-server /opt/bitnami/redis-sentinel/etc/sentinel.conf --sentinel {{- if .Values.tls.enabled }} "${ARGS[@]}" {{- end }} exec redis-server /opt/bitnami/redis-sentinel/etc/sentinel.conf --sentinel {{- if .Values.tls.enabled }} "${ARGS[@]}" {{- end }}
{{- else }} {{- else }}
start-master.sh: | start-master.sh: |
#!/bin/bash #!/bin/bash
{{- if (eq (.Values.securityContext.runAsUser | int) 0) }} {{- if and .Values.securityContext.runAsUser (eq (.Values.securityContext.runAsUser | int) 0) }}
useradd redis useradd redis
chown -R redis {{ .Values.master.persistence.path }} chown -R redis {{ .Values.master.persistence.path }}
{{- end }} {{- end }}
@@ -351,7 +327,7 @@ data:
{{- if .Values.cluster.enabled }} {{- if .Values.cluster.enabled }}
start-slave.sh: | start-slave.sh: |
#!/bin/bash #!/bin/bash
{{- if (eq (.Values.securityContext.runAsUser | int) 0) }} {{- if and .Values.securityContext.runAsUser (eq (.Values.securityContext.runAsUser | int) 0) }}
useradd redis useradd redis
chown -R redis {{ .Values.slave.persistence.path }} chown -R redis {{ .Values.slave.persistence.path }}
{{- end }} {{- end }}
bitnami/redis/templates/headless-svc.yaml
+3
View File
@@ -11,6 +11,9 @@ metadata:
spec: spec:
type: ClusterIP type: ClusterIP
clusterIP: None clusterIP: None
{{- if .Values.sentinel.enabled }}
publishNotReadyAddresses: true
{{- end }}
ports: ports:
- name: redis - name: redis
port: {{ .Values.redisPort }} port: {{ .Values.redisPort }}
bitnami/redis/values-production.yaml
+3 -3
View File
@@ -18,7 +18,7 @@ image:
## Bitnami Redis image tag ## Bitnami Redis image tag
## ref: https://github.com/bitnami/bitnami-docker-redis#supported-tags-and-respective-dockerfile-links ## ref: https://github.com/bitnami/bitnami-docker-redis#supported-tags-and-respective-dockerfile-links
## ##
tag: 6.0.9-debian-10-r38 tag: 6.0.9-debian-10-r66
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -60,7 +60,7 @@ sentinel:
## Bitnami Redis image tag ## Bitnami Redis image tag
## ref: https://github.com/bitnami/bitnami-docker-redis-sentinel#supported-tags-and-respective-dockerfile-links ## ref: https://github.com/bitnami/bitnami-docker-redis-sentinel#supported-tags-and-respective-dockerfile-links
## ##
tag: 6.0.9-debian-10-r38 tag: 6.0.9-debian-10-r66
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -650,7 +650,7 @@ metrics:
image: image:
registry: docker.io registry: docker.io
repository: bitnami/redis-exporter repository: bitnami/redis-exporter
tag: 1.13.1-debian-10-r32 tag: 1.15.0-debian-10-r8
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets. ## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace. ## Secrets must be manually created in the namespace.
bitnami/redis/values.yaml
+3 -3
View File
@@ -18,7 +18,7 @@ image:
## Bitnami Redis image tag ## Bitnami Redis image tag
## ref: https://github.com/bitnami/bitnami-docker-redis#supported-tags-and-respective-dockerfile-links ## ref: https://github.com/bitnami/bitnami-docker-redis#supported-tags-and-respective-dockerfile-links
## ##
tag: 6.0.9-debian-10-r38 tag: 6.0.9-debian-10-r66
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -60,7 +60,7 @@ sentinel:
## Bitnami Redis image tag ## Bitnami Redis image tag
## ref: https://github.com/bitnami/bitnami-docker-redis-sentinel#supported-tags-and-respective-dockerfile-links ## ref: https://github.com/bitnami/bitnami-docker-redis-sentinel#supported-tags-and-respective-dockerfile-links
## ##
tag: 6.0.9-debian-10-r38 tag: 6.0.9-debian-10-r66
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -651,7 +651,7 @@ metrics:
image: image:
registry: docker.io registry: docker.io
repository: bitnami/redis-exporter repository: bitnami/redis-exporter
tag: 1.13.1-debian-10-r32 tag: 1.15.0-debian-10-r8
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets. ## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace. ## Secrets must be manually created in the namespace.