Skip to content

Commit 829f425

Browse files
authored
chore: support specify empty password for create redis (#2297)
1 parent 5c0b47d commit 829f425

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

addons-cluster/redis/templates/_helpers.tpl

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,17 @@ Define redis cluster shardingSpec with ComponentDefinition.
2424
serviceType: LoadBalancer
2525
podService: true
2626
{{- include "kblib.loadBalancerAnnotations" . | indent 4 }}
27-
env:
28-
- name: LOAD_BALANCER_ENABLED
29-
value: "true"
3027
{{- end }}
31-
{{- if and .Values.fixedPodIPEnabled (not .Values.nodePortEnabled) (not .Values.hostNetworkEnabled) (not .Values.loadBalancerEnabled) }}
3228
env:
29+
{{- if .Values.emptyDefaultPassword }}
30+
- name: REDIS_DEFAULT_PASSWORD
31+
value: ""
32+
{{- end }}
33+
{{- if and .Values.loadBalancerEnabled (not .Values.fixedPodIPEnabled) (not .Values.hostNetworkEnabled) (not .Values.nodePortEnabled) }}
34+
- name: LOAD_BALANCER_ENABLED
35+
value: "true"
36+
{{- end }}
37+
{{- if and .Values.fixedPodIPEnabled (not .Values.nodePortEnabled) (not .Values.hostNetworkEnabled) (not .Values.loadBalancerEnabled) }}
3338
- name: FIXED_POD_IP_ENABLED
3439
value: "true"
3540
{{- end }}
@@ -101,6 +106,10 @@ Define redis ComponentSpec with ComponentDefinition.
101106
- name: LOAD_BALANCER_ENABLED
102107
value: "true"
103108
{{- end }}
109+
{{- if .Values.emptyDefaultPassword }}
110+
- name: REDIS_DEFAULT_PASSWORD
111+
value: ""
112+
{{- end }}
104113
serviceVersion: {{ .Values.version }}
105114
{{- if and .Values.customSecretName .Values.customSecretNamespace }}
106115
systemAccounts:

addons-cluster/redis/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,3 +105,7 @@ extra:
105105

106106
prometheus:
107107
enabled: false
108+
109+
emptyDefaultPassword: false
110+
111+

0 commit comments

Comments
 (0)