From f5969c8eac481ffcb273e28b66e8040102fa7cc3 Mon Sep 17 00:00:00 2001 From: Chikahisa Mikata <98073003+chikahisa-mikata@users.noreply.github.com> Date: Mon, 26 Aug 2024 21:28:27 +0900 Subject: [PATCH 1/2] chore: Update Redis-HA chart version to 4.27.3 (#295) Signed-off-by: chikahisa.mikataoe --- charts/redis-ha/Chart.yaml | 2 +- charts/redis-ha/templates/redis-ha-statefulset.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/redis-ha/Chart.yaml b/charts/redis-ha/Chart.yaml index 34e3384..bb789df 100644 --- a/charts/redis-ha/Chart.yaml +++ b/charts/redis-ha/Chart.yaml @@ -5,7 +5,7 @@ keywords: - redis - keyvalue - database -version: 4.27.2 +version: 4.27.3 appVersion: 7.2.4 description: This Helm chart provides a highly available Redis implementation with a master/slave configuration and uses Sentinel sidecars for failover management icon: https://upload.wikimedia.org/wikipedia/en/thumb/6/6b/Redis_Logo.svg/1200px-Redis_Logo.svg.png diff --git a/charts/redis-ha/templates/redis-ha-statefulset.yaml b/charts/redis-ha/templates/redis-ha-statefulset.yaml index 9ca6544..61ce45b 100644 --- a/charts/redis-ha/templates/redis-ha-statefulset.yaml +++ b/charts/redis-ha/templates/redis-ha-statefulset.yaml @@ -529,7 +529,7 @@ spec: {{- toYaml .Values.extraContainers | nindent 6 }} {{- end -}} {{- with .Values.priorityClassName | default .Values.global.priorityClassName }} - priorityClassName: {{ .Values.priorityClassName }} + priorityClassName: {{ . }} {{- end }} volumes: - name: config From 56940ae7303356ab6a797220a944842f5dcb0c07 Mon Sep 17 00:00:00 2001 From: Chris Boot Date: Mon, 26 Aug 2024 13:46:57 +0100 Subject: [PATCH 2/2] redis-ha: fix busybox-ash-ism in redis_liveness.sh (#294) * redis-ha: fix busybox-ash-ism in redis_liveness.sh The ${response:0:7} syntax is non-POSIX and not understood by Debian's dash shell, so if a Debian-based Redis image is used the liveness check breaks on slaves. A case statement makes this check more legible anyway, in my opinion, and works in all the POSIX-compatible shells (busybox ash, dash, and bash). Signed-off-by: Chris Boot * Update Chart.yaml --------- Signed-off-by: Chris Boot Co-authored-by: Aaron Layfield --- charts/redis-ha/Chart.yaml | 2 +- charts/redis-ha/templates/_configs.tpl | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/charts/redis-ha/Chart.yaml b/charts/redis-ha/Chart.yaml index bb789df..ebb75ea 100644 --- a/charts/redis-ha/Chart.yaml +++ b/charts/redis-ha/Chart.yaml @@ -5,7 +5,7 @@ keywords: - redis - keyvalue - database -version: 4.27.3 +version: 4.27.4 appVersion: 7.2.4 description: This Helm chart provides a highly available Redis implementation with a master/slave configuration and uses Sentinel sidecars for failover management icon: https://upload.wikimedia.org/wikipedia/en/thumb/6/6b/Redis_Logo.svg/1200px-Redis_Logo.svg.png diff --git a/charts/redis-ha/templates/_configs.tpl b/charts/redis-ha/templates/_configs.tpl index 459e78a..78420a1 100644 --- a/charts/redis-ha/templates/_configs.tpl +++ b/charts/redis-ha/templates/_configs.tpl @@ -643,11 +643,12 @@ {{- end}} ping ) - if [ "$response" != "PONG" ] && [ "${response:0:7}" != "LOADING" ] ; then - echo "$response" - exit 1 - fi echo "response=$response" + case $response in + PONG|LOADING*) ;; + *) exit 1 ;; + esac + exit 0 {{- end }} {{- define "redis_readiness.sh" }}