feat(redis): Stop go-templating redis init scripts

Signed-off-by: Oliver Gondža <ogondza@gmail.com>

Author: olivergondza

build/redis/haproxy_init.sh

@@ -0,0 +1,41 @@
+: "${ARGOCD_REDIS_SERVICE_NAME:?Variable ARGOCD_REDIS_SERVICE_NAME is required}"
+
+HAPROXY_CONF=/data/haproxy.cfg
+cp /readonly/haproxy.cfg "$HAPROXY_CONF"
+
+for loop in $(seq 1 10); do
+    getent hosts "${ARGOCD_REDIS_SERVICE_NAME}-announce-0" && break
+    echo "Waiting for service ${ARGOCD_REDIS_SERVICE_NAME}-announce-0 to be ready ($loop) ..." && sleep 1
+done
+ANNOUNCE_IP0=$(getent hosts "${ARGOCD_REDIS_SERVICE_NAME}-announce-0" | awk '{ print $1 }')
+if [ -z "$ANNOUNCE_IP0" ]; then
+    echo "Could not resolve the announce ip for ${ARGOCD_REDIS_SERVICE_NAME}-announce-0"
+    exit 1
+fi
+sed -i "s/REPLACE_ANNOUNCE0/$ANNOUNCE_IP0/" "$HAPROXY_CONF"
+
+for loop in $(seq 1 10); do
+    getent hosts "${ARGOCD_REDIS_SERVICE_NAME}-announce-1" && break
+    echo "Waiting for service ${ARGOCD_REDIS_SERVICE_NAME}-announce-1 to be ready ($loop) ..." && sleep 1
+done
+ANNOUNCE_IP1=$(getent hosts "${ARGOCD_REDIS_SERVICE_NAME}-announce-1" | awk '{ print $1 }')
+if [ -z "$ANNOUNCE_IP1" ]; then
+    echo "Could not resolve the announce ip for ${ARGOCD_REDIS_SERVICE_NAME}-announce-1"
+    exit 1
+fi
+sed -i "s/REPLACE_ANNOUNCE1/$ANNOUNCE_IP1/" "$HAPROXY_CONF"
+
+for loop in $(seq 1 10); do
+    getent hosts "${ARGOCD_REDIS_SERVICE_NAME}-announce-2" && break
+    echo "Waiting for service ${ARGOCD_REDIS_SERVICE_NAME}-announce-2 to be ready ($loop) ..." && sleep 1
+done
+ANNOUNCE_IP2=$(getent hosts "${ARGOCD_REDIS_SERVICE_NAME}-announce-2" | awk '{ print $1 }')
+if [ -z "$ANNOUNCE_IP2" ]; then
+    echo "Could not resolve the announce ip for ${ARGOCD_REDIS_SERVICE_NAME}-announce-2"
+    exit 1
+fi
+sed -i "s/REPLACE_ANNOUNCE2/$ANNOUNCE_IP2/" "$HAPROXY_CONF"
+
+auth=$(cat /redis-initial-pass/admin.password)
+sed -i "s/replace-with-redis-auth/$auth/" "$HAPROXY_CONF"
+

build/redis/haproxy_init.sh.tpl

@@ -1,23 +1,29 @@
 echo "$(date) Start..."
+
+: "${ARGOCD_REDIS_USE_TLS:?Variable ARGOCD_REDIS_USE_TLS is required}"
+: "${ARGOCD_REDIS_SERVICE_NAME:?Variable ARGOCD_REDIS_SERVICE_NAME is required}"
+
 HOSTNAME="$(cat /proc/sys/kernel/hostname)"
 INDEX="${HOSTNAME##*-}"
-SENTINEL_PORT={{- if eq .UseTLS "false" -}}26379{{- else -}}0{{- end }}
 MASTER=''
 MASTER_GROUP="argocd"
 QUORUM="2"
 REDIS_CONF=/data/conf/redis.conf
-{{- if eq .UseTLS "false"}}
-REDIS_PORT=6379
-REDIS_TLS_PORT=
-{{- else}}
-REDIS_PORT=0
-REDIS_TLS_PORT=6379
-{{- end}}
+if [ "$ARGOCD_REDIS_USE_TLS" = "false" ]; then
+    REDIS_PORT=6379
+    REDIS_TLS_PORT=
+    SENTINEL_PORT=26379
+    SENTINEL_TLS_PORT=
+else
+    REDIS_PORT=0
+    REDIS_TLS_PORT=6379
+    SENTINEL_PORT=0
+    SENTINEL_TLS_PORT=26379
+fi
 SENTINEL_CONF=/data/conf/sentinel.conf
-SENTINEL_TLS_PORT={{- if eq .UseTLS "true" -}}26379{{- end }}
-SERVICE={{.ServiceName}}
-SENTINEL_TLS_REPLICATION_ENABLED={{.UseTLS}}
-REDIS_TLS_REPLICATION_ENABLED={{.UseTLS}}
+SERVICE=$ARGOCD_REDIS_SERVICE_NAME
+SENTINEL_TLS_REPLICATION_ENABLED=$ARGOCD_REDIS_USE_TLS
+REDIS_TLS_REPLICATION_ENABLED=$ARGOCD_REDIS_USE_TLS
 set -eu
 
 sentinel_get_master() {
@@ -48,7 +54,7 @@ sentinel_get_master_retry() {
 
 identify_master() {
     echo "Identifying redis master (get-master-addr-by-name).."
-    echo "  using sentinel ({{.ServiceName}}), sentinel group name (argocd)"
+    echo "  using sentinel (${ARGOCD_REDIS_SERVICE_NAME}), sentinel group name (argocd)"
     echo "  $(date).."
     MASTER="$(sentinel_get_master_retry 3)"
     if [ -n "${MASTER}" ]; then

build/redis/init.sh.tpl build/redis/init.shbuild/redis/init.sh.tpl renamed to build/redis/init.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+# Minimalistic sh strict-mode as there is no bash in redis container
+set -eu
+
+response=$(redis-cli -a "${AUTH}" --no-auth-warning "$@" ping)
+if [ "$response" != "PONG" ] && [ "${response:0:7}" != "LOADING" ] ; then
+  echo "$response"
+  exit 1
+fi
+echo "response=$response"

build/redis/redis_liveness.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+# Minimalistic sh strict-mode as there is no bash in redis container
+set -eu
+
+response=$(redis-cli -a "${AUTH}" --no-auth-warning "$@" ping)
+if [ "$response" != "PONG" ]; then
+  echo "$response"
+  exit 1
+fi
+echo "response=$response"

build/redis/redis_liveness.sh.tpl

@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+# Minimalistic sh strict-mode as there is no bash in redis container
+set -eu
+
+response=$(redis-cli "$@" ping)
+if [ "$response" != "PONG" ]; then
+  echo "$response"
+  exit 1
+fi
+echo "response=$response"

build/redis/redis_readiness.sh

@@ -711,20 +711,20 @@ func (r *ReconcileArgoCD) reconcileRedisConfiguration(cr *argoproj.ArgoCD, useTL
 	if err := r.reconcileRedisHAConfigMap(cr, useTLSForRedis); err != nil {
 		return err
 	}
-	if err := r.reconcileRedisHAHealthConfigMap(cr, useTLSForRedis); err != nil {
+	if err := r.reconcileRedisHAHealthConfigMap(cr); err != nil {
 		return err
 	}
 	return nil
 }
 
 // reconcileRedisHAConfigMap will ensure that the Redis HA Health ConfigMap is present for the given ArgoCD.
-func (r *ReconcileArgoCD) reconcileRedisHAHealthConfigMap(cr *argoproj.ArgoCD, useTLSForRedis bool) error {
+func (r *ReconcileArgoCD) reconcileRedisHAHealthConfigMap(cr *argoproj.ArgoCD) error {
 	ctx := context.TODO()
 	cm := newConfigMapWithName(common.ArgoCDRedisHAHealthConfigMapName, cr)
 	cm.Data = map[string]string{
-		"redis_liveness.sh":    getRedisLivenessScript(useTLSForRedis),
-		"redis_readiness.sh":   getRedisReadinessScript(useTLSForRedis),
-		"sentinel_liveness.sh": getSentinelLivenessScript(useTLSForRedis),
+		"redis_liveness.sh":    getRedisLivenessScript(),
+		"redis_readiness.sh":   getRedisReadinessScript(),
+		"sentinel_liveness.sh": getSentinelLivenessScript(),
 	}
 	existingCM := &corev1.ConfigMap{}
 	exists, err := argoutil.IsObjectFound(r.Client, cr.Namespace, cm.Name, existingCM)
@@ -779,7 +779,7 @@ func (r *ReconcileArgoCD) reconcileRedisHAConfigMap(cr *argoproj.ArgoCD, useTLSF
 	desired.Data = map[string]string{
 		"haproxy.cfg":     getRedisHAProxyConfig(cr, useTLSForRedis),
 		"haproxy_init.sh": getRedisHAProxyScript(cr),
-		"init.sh":         getRedisInitScript(cr, useTLSForRedis),
+		"init.sh":         getRedisInitScript(),
 		"redis.conf":      getRedisConf(useTLSForRedis),
 		"sentinel.conf":   getRedisSentinelConf(useTLSForRedis),
 	}
@@ -854,7 +854,7 @@ func (r *ReconcileArgoCD) recreateRedisHAHealthConfigMap(cr *argoproj.ArgoCD, us
 			return err
 		}
 	}
-	return r.reconcileRedisHAHealthConfigMap(cr, useTLSForRedis)
+	return r.reconcileRedisHAHealthConfigMap(cr)
 }
 
 // reconcileSSHKnownHosts will ensure that the ArgoCD SSH Known Hosts ConfigMap is present.