Skip to content

Commit 65079c0

Browse files
authored
Revert "chore: support specify empty password for create redis (#2298)"
This reverts commit 34f3846.
1 parent 34f3846 commit 65079c0

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,20 @@ Define redis cluster shardingSpec with ComponentDefinition.
2020
serviceType: LoadBalancer
2121
podService: true
2222
{{- include "kblib.loadBalancerAnnotations" . | indent 4 }}
23-
{{- end }}
2423
env:
25-
{{- if and .Values.hostNetworkEnabled (not .Values.nodePortEnabled) (not .Values.fixedPodIPEnabled) (not .Values.loadBalancerEnabled) }}
26-
- name: HOST_NETWORK_ENABLED
24+
- name: LOAD_BALANCER_ENABLED
2725
value: "true"
2826
{{- end }}
2927
{{- if and .Values.fixedPodIPEnabled (not .Values.nodePortEnabled) (not .Values.hostNetworkEnabled) (not .Values.loadBalancerEnabled) }}
28+
env:
3029
- name: FIXED_POD_IP_ENABLED
3130
value: "true"
3231
{{- end }}
33-
{{- if and .Values.loadBalancerEnabled (not .Values.fixedPodIPEnabled) (not .Values.hostNetworkEnabled) (not .Values.nodePortEnabled) }}
34-
- name: LOAD_BALANCER_ENABLED
32+
{{- if and .Values.hostNetworkEnabled (not .Values.nodePortEnabled) (not .Values.fixedPodIPEnabled) (not .Values.loadBalancerEnabled) }}
33+
env:
34+
- name: HOST_NETWORK_ENABLED
3535
value: "true"
3636
{{- end }}
37-
{{- if .Values.emptyDefaultPassword }}
38-
- name: REDIS_DEFAULT_PASSWORD
39-
value: ""
40-
{{- end }}
4137
serviceVersion: {{ .Values.version }}
4238
systemAccounts:
4339
- name: default
@@ -104,10 +100,6 @@ Define redis ComponentSpec with ComponentDefinition.
104100
- name: HOST_NETWORK_ENABLED
105101
value: "true"
106102
{{- end }}
107-
{{- if .Values.emptyDefaultPassword }}
108-
- name: REDIS_DEFAULT_PASSWORD
109-
value: ""
110-
{{- end }}
111103
enabledLogs:
112104
- running
113105
serviceAccountName: {{ include "kblib.serviceAccountName" . }}

addons-cluster/redis-cluster/values.yaml

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

102-
emptyDefaultPassword: false
103-

0 commit comments

Comments
 (0)