chore: tidy up redis chart

addons-cluster/redis/templates/_helpers.tpl

@@ -49,20 +49,6 @@ Define redis cluster shardingSpec with ComponentDefinition.
         value: "true"
     {{- end }}
     serviceVersion: {{ .Values.version }}
-    systemAccounts:
-    - name: default
-      {{- if and .Values.redisCluster.customSecretName .Values.redisCluster.customSecretNamespace }}
-      secretRef:
-        name: {{ .Values.redisCluster.customSecretName }}
-        namespace: {{ .Values.redisCluster.customSecretNamespace }}
-      {{- else }}
-      passwordConfig:
-        length: 10
-        numDigits: 5
-        numSymbols: 0
-        letterCase: MixedCases
-        seed: {{ include "kblib.clusterName" . }}
-      {{- end }}
     resources:
       limits:
         cpu: {{ .Values.cpu | quote }}

addons-cluster/redis/templates/cluster.yaml

@@ -3,6 +3,16 @@
   {{- include "redis-cluster.clusterCommon" . }}
   clusterDef: redis
   topology: {{ .Values.mode }}
+  services:
+  - componentSelector: shard
+    name: secondary
+    serviceName:  shard-secondary
+    roleSelector: secondary
+    spec:
+      ports:
+        - name: redis-cluster
+          port: 6379
+          targetPort: redis-cluster
   shardings:
   {{- include "redis-cluster.shardingSpec" . | indent 2 }}
 {{- else }}

addons/redis/templates/shardingdefinition.yaml

@@ -14,6 +14,9 @@ spec:
     maxShards: 64
   provisionStrategy: Parallel
   updateStrategy: Parallel
+  systemAccounts:
+    - name: default
+      shared: true
   lifecycleActions:
     shardRemove:
       timeoutSeconds: 600