chore(redis): use env replace creds volume

Author: duanhongyi

charts/redis/templates/redis-secret-creds.yaml

@@ -9,6 +9,12 @@ metadata:
     "helm.sh/hook": pre-install
 data: 
   {{ if eq .Values.global.redisLocation "on-cluster"}}
+  {{- $redisAddrs := (list ) }}
+  {{ $redisNodeCount := .Values.replicas | int }}
+  {{- range $i := until $redisNodeCount }}
+  {{- $redisAddrs = (append $redisAddrs (printf "drycc-redis-%d.drycc-redis.%s.svc.%s:6379" $i $.Release.Namespace $.Values.global.clusterDomain)) }}
+  {{- end -}}
+  addrs: {{ join "," $redisAddrs | b64enc }}
   password: {{ randAlphaNum 32 | b64enc }}
   {{ else if eq .Values.global.redisLocation "off-cluster"}}
   addrs: {{ .Values.addrs | b64enc }}

charts/redis/templates/redis-statefulset.yaml

@@ -39,21 +39,21 @@ spec:
         - "6379"
         ports:
         - containerPort: 6379
-        volumeMounts:
-        - name: redis-creds
-          mountPath: /var/run/secrets/drycc/redis/creds
         {{- if .Values.persistence.enabled }}
+        env:
+        - name: DRYCC_REDIS_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: redis-creds
+              key: password
+        volumeMounts:
         - name: redis-data
           mountPath: /data
         {{- end }}
       securityContext:
         fsGroup: 1001
         runAsGroup: 1001
         runAsUser: 1001
-      volumes:
-      - name: redis-creds
-        secret:
-          secretName: redis-creds
   {{- if .Values.persistence.enabled }}
   volumeClaimTemplates:
   - metadata:

rootfs/bin/boot

@@ -5,12 +5,8 @@ set -eof pipefail
 REDIS_CONFIG_FILE=/etc/redis/redis.conf
 
 # Set password
-REDIS_PASSWORD_FILE=/var/run/secrets/drycc/redis/creds/password
-if [ -e $REDIS_PASSWORD_FILE ]; then
-    REDIS_PASSWORD="$(cat /var/run/secrets/drycc/redis/creds/password)"
-    if [ -n "$REDIS_PASSWORD" ]; then
-        printf "\nrequirepass %s" "$REDIS_PASSWORD" >> $REDIS_CONFIG_FILE
-    fi
+if [ -n "$DRYCC_REDIS_PASSWORD" ]; then
+    printf "\nrequirepass %s" "$DRYCC_REDIS_PASSWORD" >> $REDIS_CONFIG_FILE
 fi
 
 exec redis-server $REDIS_CONFIG_FILE "$@"