mirror of
https://github.com/helm/charts.git
synced 2026-08-23 22:37:45 +00:00
[stable/redis] remove manual discovery of sentinels (#15005)
redis-sentinel auto-discovers all the slaves running in the cluster, we only need to specify the masters to monitor. Fixes #14766 where in the cluster goes into a error condition when the master node and one or more slave nodes are re-created at the same time. Signed-off-by: Sameer Naik <sameersbn@vmware.com>
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
68d17b674f
commit
daaff5ef55
@@ -1,6 +1,6 @@
|
||||
apiVersion: v1
|
||||
name: redis
|
||||
version: 8.0.11
|
||||
version: 8.0.12
|
||||
appVersion: 5.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:
|
||||
|
||||
@@ -179,10 +179,6 @@ spec:
|
||||
printf "\nsentinel auth-pass {{ .Values.sentinel.masterSet }} $REDIS_PASSWORD" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf
|
||||
{{- end }}
|
||||
fi
|
||||
echo "Getting information about current running sentinels"
|
||||
# Get information from existing sentinels
|
||||
existing_sentinels=$(timeout -s 9 {{ .Values.sentinel.initialCheckTimeout }} redis-cli --raw -h {{ template "redis.fullname" . }} -a $REDIS_PASSWORD -p {{ .Values.sentinel.service.sentinelPort }} SENTINEL sentinels {{ .Values.sentinel.masterSet }})
|
||||
echo "$existing_sentinels" | awk -f /health/parse_sentinels.awk | tee -a /opt/bitnami/redis-sentinel/etc/sentinel.conf
|
||||
|
||||
redis-server /opt/bitnami/redis-sentinel/etc/sentinel.conf --sentinel
|
||||
env:
|
||||
|
||||
@@ -211,10 +211,6 @@ spec:
|
||||
printf "\nsentinel auth-pass {{ .Values.sentinel.masterSet }} $REDIS_PASSWORD" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf
|
||||
{{- end }}
|
||||
fi
|
||||
echo "Getting information about current running sentinels"
|
||||
# Get information from existing sentinels
|
||||
existing_sentinels=$(timeout -s 9 {{ .Values.sentinel.initialCheckTimeout }} redis-cli --raw -h {{ template "redis.fullname" . }} -a $REDIS_PASSWORD -p {{ .Values.sentinel.service.sentinelPort }} SENTINEL sentinels {{ .Values.sentinel.masterSet }})
|
||||
echo "$existing_sentinels" | awk -f /health/parse_sentinels.awk | tee -a /opt/bitnami/redis-sentinel/etc/sentinel.conf
|
||||
|
||||
redis-server /opt/bitnami/redis-sentinel/etc/sentinel.conf --sentinel
|
||||
env:
|
||||
|
||||
Reference in New Issue
Block a user