Skip to content

Commit b272220

Browse files
authored
Revert "chore: support specify empty password for create redis (#2297)"
This reverts commit 829f425.
1 parent 9bbe370 commit b272220

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

addons-cluster/redis/templates/_helpers.tpl

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,12 @@ Define redis cluster shardingSpec with ComponentDefinition.
2424
serviceType: LoadBalancer
2525
podService: true
2626
{{- include "kblib.loadBalancerAnnotations" . | indent 4 }}
27-
{{- end }}
2827
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 }}
28+
- name: LOAD_BALANCER_ENABLED
29+
value: "true"
30+
{{- end }}
3731
{{- if and .Values.fixedPodIPEnabled (not .Values.nodePortEnabled) (not .Values.hostNetworkEnabled) (not .Values.loadBalancerEnabled) }}
32+
env:
3833
- name: FIXED_POD_IP_ENABLED
3934
value: "true"
4035
{{- end }}
@@ -106,10 +101,6 @@ Define redis ComponentSpec with ComponentDefinition.
106101
- name: LOAD_BALANCER_ENABLED
107102
value: "true"
108103
{{- end }}
109-
{{- if .Values.emptyDefaultPassword }}
110-
- name: REDIS_DEFAULT_PASSWORD
111-
value: ""
112-
{{- end }}
113104
serviceVersion: {{ .Values.version }}
114105
{{- if and .Values.customSecretName .Values.customSecretNamespace }}
115106
systemAccounts:

addons-cluster/redis/values.yaml

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

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

0 commit comments

Comments
 (0)