Skip to content

Commit 34f3846

Browse files
authored
chore: support specify empty password for create redis (#2298)
1 parent 710cf4f commit 34f3846

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

addons-cluster/redis-cluster/templates/_helpers.tpl

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,24 @@ Define redis cluster shardingSpec with ComponentDefinition.
2020
serviceType: LoadBalancer
2121
podService: true
2222
{{- include "kblib.loadBalancerAnnotations" . | indent 4 }}
23+
{{- end }}
2324
env:
24-
- name: LOAD_BALANCER_ENABLED
25+
{{- if and .Values.hostNetworkEnabled (not .Values.nodePortEnabled) (not .Values.fixedPodIPEnabled) (not .Values.loadBalancerEnabled) }}
26+
- name: HOST_NETWORK_ENABLED
2527
value: "true"
2628
{{- end }}
2729
{{- if and .Values.fixedPodIPEnabled (not .Values.nodePortEnabled) (not .Values.hostNetworkEnabled) (not .Values.loadBalancerEnabled) }}
28-
env:
2930
- name: FIXED_POD_IP_ENABLED
3031
value: "true"
3132
{{- end }}
32-
{{- if and .Values.hostNetworkEnabled (not .Values.nodePortEnabled) (not .Values.fixedPodIPEnabled) (not .Values.loadBalancerEnabled) }}
33-
env:
34-
- name: HOST_NETWORK_ENABLED
33+
{{- if and .Values.loadBalancerEnabled (not .Values.fixedPodIPEnabled) (not .Values.hostNetworkEnabled) (not .Values.nodePortEnabled) }}
34+
- name: LOAD_BALANCER_ENABLED
3535
value: "true"
3636
{{- end }}
37+
{{- if .Values.emptyDefaultPassword }}
38+
- name: REDIS_DEFAULT_PASSWORD
39+
value: ""
40+
{{- end }}
3741
serviceVersion: {{ .Values.version }}
3842
systemAccounts:
3943
- name: default
@@ -100,6 +104,10 @@ Define redis ComponentSpec with ComponentDefinition.
100104
- name: HOST_NETWORK_ENABLED
101105
value: "true"
102106
{{- end }}
107+
{{- if .Values.emptyDefaultPassword }}
108+
- name: REDIS_DEFAULT_PASSWORD
109+
value: ""
110+
{{- end }}
103111
enabledLogs:
104112
- running
105113
serviceAccountName: {{ include "kblib.serviceAccountName" . }}

addons-cluster/redis-cluster/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,5 @@ redisCluster:
9999
customSecretName: ""
100100
customSecretNamespace: ""
101101

102+
emptyDefaultPassword: false
103+

0 commit comments

Comments
 (0)