diff --git a/stable/redis-ha/Chart.yaml b/stable/redis-ha/Chart.yaml index 4411ab6aee..5d7432b785 100644 --- a/stable/redis-ha/Chart.yaml +++ b/stable/redis-ha/Chart.yaml @@ -6,7 +6,7 @@ keywords: - redis - keyvalue - database -version: 4.2.0 +version: 4.3.0 appVersion: 5.0.6 description: Highly available Kubernetes implementation of Redis icon: https://upload.wikimedia.org/wikipedia/en/thumb/6/6b/Redis_Logo.svg/1200px-Redis_Logo.svg.png diff --git a/stable/redis-ha/README.md b/stable/redis-ha/README.md index 1e471f632e..286d06a7b6 100644 --- a/stable/redis-ha/README.md +++ b/stable/redis-ha/README.md @@ -125,6 +125,7 @@ The following table lists the configurable parameters of the Redis chart and the | `haproxy.timeout.connect` | haproxy.cfg `timeout connect` setting | `4s` | | `haproxy.timeout.server` | haproxy.cfg `timeout server` setting | `30s` | | `haproxy.timeout.client` | haproxy.cfg `timeout client` setting | `30s` | +| `haproxy.timeout.check` | haproxy.cfg `timeout check` setting | `2s` | | `haproxy.priorityClassName` | priorityClassName for `haproxy` deployment | not set | | `haproxy.securityContext` | Security context to be added to the HAProxy deployment. | `{runAsUser: 1000, fsGroup: 1000, runAsNonRoot: true}` | | `haproxy.hardAntiAffinity` | Whether the haproxy pods should be forced to run on separate nodes. | `true` | diff --git a/stable/redis-ha/templates/_configs.tpl b/stable/redis-ha/templates/_configs.tpl index 1b502743d1..51e00c7712 100644 --- a/stable/redis-ha/templates/_configs.tpl +++ b/stable/redis-ha/templates/_configs.tpl @@ -87,7 +87,7 @@ echo "Attempting to find master" if [ "$(redis-cli -h "$MASTER"{{ if .Values.auth }} -a "$AUTH"{{ end }} ping)" != "PONG" ]; then echo "Can't ping master, attempting to force failover" - if redis-cli -h "$SERVICE" -p "$SENTINEL_PORT" sentinel failover "$MASTER_GROUP" | grep -q 'NOGOODSLAVE' ; then + if redis-cli -h "$SERVICE" -p "$SENTINEL_PORT" sentinel failover "$MASTER_GROUP" | grep -q 'NOGOODSLAVE' ; then setup_defaults return 0 fi @@ -137,9 +137,10 @@ {{- else }} defaults REDIS mode tcp - timeout connect {{ .Values.haproxy.timeout.connect }} - timeout server {{ .Values.haproxy.timeout.server }} - timeout client {{ .Values.haproxy.timeout.client }} + timeout connect {{ .Values.haproxy.timeout.connect }} + timeout server {{ .Values.haproxy.timeout.server }} + timeout client {{ .Values.haproxy.timeout.client }} + timeout check {{ .Values.haproxy.timeout.check }} listen health_check_http_url bind :8888 diff --git a/stable/redis-ha/templates/redis-ha-statefulset.yaml b/stable/redis-ha/templates/redis-ha-statefulset.yaml index 71a253e04f..776cceae3e 100644 --- a/stable/redis-ha/templates/redis-ha-statefulset.yaml +++ b/stable/redis-ha/templates/redis-ha-statefulset.yaml @@ -157,7 +157,7 @@ spec: image: {{ .Values.image.repository }}:{{ .Values.image.tag }} imagePullPolicy: {{ .Values.image.pullPolicy }} command: - - redis-server + - redis-server args: - /data/conf/redis.conf env: diff --git a/stable/redis-ha/values.yaml b/stable/redis-ha/values.yaml index 3e9132de8b..fd3b8922e2 100644 --- a/stable/redis-ha/values.yaml +++ b/stable/redis-ha/values.yaml @@ -82,6 +82,7 @@ haproxy: connect: 4s server: 30s client: 30s + check: 2s securityContext: runAsUser: 1000 fsGroup: 1000