From fb43067cff60038fbda1fcd5f68d92a4ad30ebda Mon Sep 17 00:00:00 2001 From: Henri Koski Date: Fri, 21 Apr 2023 11:50:04 +0300 Subject: [PATCH] Support alpine based keydb image Refactor server.sh from bash to sh since bash isn't installed in alpine image. --- keydb/Chart.yaml | 2 +- keydb/templates/secret-utils.yaml | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/keydb/Chart.yaml b/keydb/Chart.yaml index f164c80..13a9bbf 100644 --- a/keydb/Chart.yaml +++ b/keydb/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: keydb description: A Helm chart for KeyDB multimaster setup type: application -version: 0.48.0 +version: 0.49.0 keywords: - keydb - redis diff --git a/keydb/templates/secret-utils.yaml b/keydb/templates/secret-utils.yaml index ec9b8fb..6f5cc70 100644 --- a/keydb/templates/secret-utils.yaml +++ b/keydb/templates/secret-utils.yaml @@ -7,15 +7,18 @@ metadata: type: Opaque stringData: server.sh: | - #!/bin/bash - set -euxo pipefail + #!/bin/sh + set -euxo host="$(hostname)" - replicas=() - for node in {0..{{ (sub (.Values.nodes | int) 1) }}}; do + replicas= + + node=0 + while [ $node -le {{ (sub (.Values.nodes | int) 1) }} ]; do if [ "${host}" != "{{ include "keydb.fullname" . }}-${node}" ]; then - replicas+=("--replicaof {{ include "keydb.fullname" . }}-${node}.{{ include "keydb.fullname" . }}-headless {{ .Values.port }}") + replicas="${replicas} --replicaof {{ include "keydb.fullname" . }}-${node}.{{ include "keydb.fullname" . }}-headless {{ .Values.port }}" fi + node=$(( node + 1 )) done exec keydb-server /etc/keydb/redis.conf \ --active-replica {{ .Values.activeReplicas | quote }} \ @@ -43,4 +46,4 @@ stringData: {{- end }} {{- end }} {{- end }} - "${replicas[@]}" + $(echo "${replicas}" | xargs)