From 97d131e2519681a75ca498f7f8fa6d3926f4f6dc Mon Sep 17 00:00:00 2001
From: hongming <hongming@kubesphere.io>
Date: Fri, 20 Dec 2024 14:37:04 +0800
Subject: [PATCH] fix: incorrect redis config (#2130) (#6316)

Signed-off-by: hongming <coder.scala@gmail.com>
---
 config/ks-core/templates/redis.yaml | 43 ++++++++---------------------
 1 file changed, 12 insertions(+), 31 deletions(-)

diff --git a/config/ks-core/templates/redis.yaml b/config/ks-core/templates/redis.yaml
index 942ed4f5d..61348f01c 100644
--- a/config/ks-core/templates/redis.yaml
+++ b/config/ks-core/templates/redis.yaml
@@ -3,14 +3,18 @@
 {{- if lookup "v1" "Secret" "kubesphere-system" "redis-secret" }}
 {{- lookup "v1" "Secret" "kubesphere-system" "redis-secret" | toYaml }}
 {{- else }}
+{{-  $auth := randAlphaNum 15 }}
 apiVersion: v1
 kind: Secret
 metadata:
   name: redis-secret
-  namespace: kubesphere-system
 type: Opaque
-data:
-  auth: {{  randAlphaNum 15 | b64enc }}
+stringData:
+  auth: {{ $auth | quote }}
+  redis.conf: |
+    requirepass {{ $auth }}
+    masterauth {{ $auth }}
+    port {{ .Values.redis.port | default 6379 }}
 {{- end }}
 {{- end }}
 
@@ -21,27 +25,21 @@ kind: Deployment
 metadata:
   labels:
     app: redis
-    tier: database
-    version: redis-4.0
   name: redis
-  namespace: kubesphere-system
 spec:
   replicas: {{ .Values.redis.replicaCount }}
   selector:
     matchLabels:
       app: redis
-      tier: database
   template:
     metadata:
       labels:
         app: redis
-        tier: database
-        version: redis-4.0
     spec:
       containers:
         - image: {{ template "redis.image" . }}
           imagePullPolicy: {{ .Values.redis.image.pullPolicy }}
-          command: ['sh', '-c', 'cat /tmp/redis/redis.conf | sed "s/REDIS_PASSWORD/$KUBESPHERE_CACHE_OPTIONS_PASSWORD/" > /data/redis.conf | redis-server /data/redis.conf']
+          command: ['sh', '-c', 'redis-server /etc/redis/redis.conf']
           name: redis
           args: ["/data/redis.conf"]
           env:
@@ -52,7 +50,8 @@ spec:
                   key: auth
           volumeMounts:
             - name: redis-config
-              mountPath: "/tmp/redis"
+              mountPath: "/etc/redis/redis.conf"
+              subPath: redis.conf
               readOnly: true
 {{- if .Values.redis.persistentVolume.enabled }}
             - mountPath: /data
@@ -71,8 +70,8 @@ spec:
               memory: 100Mi
       volumes:
         - name: redis-config
-          configMap:
-            name: redis-configmap
+          secret:
+            secretName: redis-secret
 {{- if .Values.redis.persistentVolume.enabled }}
         - name: redis-pvc
           persistentVolumeClaim:
@@ -95,20 +94,6 @@ spec:
       {{- if .Values.tolerations }}
       tolerations: {{- toYaml .Values.tolerations | nindent 8 }}{{- end }}
 
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: redis-configmap
-  labels:
-    app: redis
-    tier: database
-    version: redis-4.0
-data:
-  redis.conf: |
-    requirepass REDIS_PASSWORD
-    masterauth REDIS_PASSWORD
-    port {{ .Values.redis.port | default 6379 }}
 
 ---
 apiVersion: v1
@@ -116,9 +101,7 @@ kind: Service
 metadata:
   labels:
     app: redis
-    tier: database
   name: redis
-  namespace: kubesphere-system
 spec:
   ports:
     - name: redis
@@ -127,7 +110,6 @@ spec:
       targetPort: {{ .Values.redis.port | default 6379 }}
   selector:
     app: redis
-    tier: database
   sessionAffinity: None
   type: ClusterIP
 
@@ -137,7 +119,6 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: redis-pvc
-  namespace: kubesphere-system
 spec:
   accessModes:
     - ReadWriteOnce