Skip to content

Commit d17f1fe

Browse files
olamilekan000olamilekan000
committed
add-redis-sentinel-integration
1 parent b4da73e commit d17f1fe

5 files changed

Lines changed: 92 additions & 0 deletions

File tree

‎charts/agent/templates/deployment.yaml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,26 @@ spec:
162162
{{- if .Values.global.externalRedis.addresses }}
163163
- name: CONVOY_REDIS_CLUSTER_ADDRESSES
164164
value: {{ .Values.global.externalRedis.addresses | quote }}
165+
{{- if eq .Values.global.externalRedis.scheme "redis-sentinel" }}
166+
- name: CONVOY_REDIS_SCHEME
167+
value: {{ .Values.global.externalRedis.scheme | quote }}
168+
- name: CONVOY_REDIS_SENTINEL_MASTER_NAME
169+
value: {{ .Values.global.externalRedis.sentinelMasterName | default "mymaster" | quote }}
170+
{{- if ne .Values.global.externalRedis.sentinelSecret "" }}
171+
- name: CONVOY_REDIS_SENTINEL_PASSWORD
172+
valueFrom:
173+
secretKeyRef:
174+
name: "{{ .Values.global.externalRedis.sentinelSecret }}"
175+
key: password
176+
{{- else if .Values.global.externalRedis.sentinelPassword }}
177+
- name: CONVOY_REDIS_SENTINEL_PASSWORD
178+
value: {{ .Values.global.externalRedis.sentinelPassword | quote }}
179+
{{- end }}
180+
{{- if .Values.global.externalRedis.sentinelUsername }}
181+
- name: CONVOY_REDIS_SENTINEL_USERNAME
182+
value: {{ .Values.global.externalRedis.sentinelUsername | quote }}
183+
{{- end }}
184+
{{- end }}
165185
{{- else }}
166186
- name: CONVOY_REDIS_TYPE
167187
value: "EXTERNAL"
@@ -185,6 +205,24 @@ spec:
185205
value: {{ .Values.global.externalRedis.username | quote }}
186206
- name: CONVOY_REDIS_DATABASE
187207
value: {{ .Values.global.externalRedis.database | quote }}
208+
{{- if eq .Values.global.externalRedis.scheme "redis-sentinel" }}
209+
- name: CONVOY_REDIS_SENTINEL_MASTER_NAME
210+
value: {{ .Values.global.externalRedis.sentinelMasterName | default "mymaster" | quote }}
211+
{{- if ne .Values.global.externalRedis.sentinelSecret "" }}
212+
- name: CONVOY_REDIS_SENTINEL_PASSWORD
213+
valueFrom:
214+
secretKeyRef:
215+
name: "{{ .Values.global.externalRedis.sentinelSecret }}"
216+
key: password
217+
{{- else if .Values.global.externalRedis.sentinelPassword }}
218+
- name: CONVOY_REDIS_SENTINEL_PASSWORD
219+
value: {{ .Values.global.externalRedis.sentinelPassword | quote }}
220+
{{- end }}
221+
{{- if .Values.global.externalRedis.sentinelUsername }}
222+
- name: CONVOY_REDIS_SENTINEL_USERNAME
223+
value: {{ .Values.global.externalRedis.sentinelUsername | quote }}
224+
{{- end }}
225+
{{- end }}
188226
{{- end }}
189227
{{- end }}
190228

‎charts/agent/values.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ global:
4242
addresses: ""
4343
host: "redis-master"
4444
scheme: "redis"
45+
sentinelMasterName: "mymaster"
46+
sentinelUsername: ""
47+
sentinelPassword: ""
48+
sentinelSecret: ""
4549
username: ""
4650
password: ""
4751
secret: ""

‎charts/server/templates/deployment.yaml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,26 @@ spec:
199199
{{- if .Values.global.externalRedis.addresses }}
200200
- name: CONVOY_REDIS_CLUSTER_ADDRESSES
201201
value: {{ .Values.global.externalRedis.addresses | quote }}
202+
{{- if eq .Values.global.externalRedis.scheme "redis-sentinel" }}
203+
- name: CONVOY_REDIS_SCHEME
204+
value: {{ .Values.global.externalRedis.scheme | quote }}
205+
- name: CONVOY_REDIS_SENTINEL_MASTER_NAME
206+
value: {{ .Values.global.externalRedis.sentinelMasterName | default "mymaster" | quote }}
207+
{{- if ne .Values.global.externalRedis.sentinelSecret "" }}
208+
- name: CONVOY_REDIS_SENTINEL_PASSWORD
209+
valueFrom:
210+
secretKeyRef:
211+
name: "{{ .Values.global.externalRedis.sentinelSecret }}"
212+
key: password
213+
{{- else if .Values.global.externalRedis.sentinelPassword }}
214+
- name: CONVOY_REDIS_SENTINEL_PASSWORD
215+
value: {{ .Values.global.externalRedis.sentinelPassword | quote }}
216+
{{- end }}
217+
{{- if .Values.global.externalRedis.sentinelUsername }}
218+
- name: CONVOY_REDIS_SENTINEL_USERNAME
219+
value: {{ .Values.global.externalRedis.sentinelUsername | quote }}
220+
{{- end }}
221+
{{- end }}
202222
{{- else }}
203223
- name: CONVOY_REDIS_TYPE
204224
value: "EXTERNAL"
@@ -222,6 +242,24 @@ spec:
222242
value: {{ .Values.global.externalRedis.username | quote }}
223243
- name: CONVOY_REDIS_DATABASE
224244
value: {{ .Values.global.externalRedis.database | quote }}
245+
{{- if eq .Values.global.externalRedis.scheme "redis-sentinel" }}
246+
- name: CONVOY_REDIS_SENTINEL_MASTER_NAME
247+
value: {{ .Values.global.externalRedis.sentinelMasterName | default "mymaster" | quote }}
248+
{{- if ne .Values.global.externalRedis.sentinelSecret "" }}
249+
- name: CONVOY_REDIS_SENTINEL_PASSWORD
250+
valueFrom:
251+
secretKeyRef:
252+
name: "{{ .Values.global.externalRedis.sentinelSecret }}"
253+
key: password
254+
{{- else if .Values.global.externalRedis.sentinelPassword }}
255+
- name: CONVOY_REDIS_SENTINEL_PASSWORD
256+
value: {{ .Values.global.externalRedis.sentinelPassword | quote }}
257+
{{- end }}
258+
{{- if .Values.global.externalRedis.sentinelUsername }}
259+
- name: CONVOY_REDIS_SENTINEL_USERNAME
260+
value: {{ .Values.global.externalRedis.sentinelUsername | quote }}
261+
{{- end }}
262+
{{- end }}
225263
{{- end }}
226264
{{- end }}
227265

‎charts/server/values.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ global:
4343
addresses: ""
4444
host: "redis-master"
4545
scheme: "redis"
46+
sentinelMasterName: "mymaster"
47+
sentinelUsername: ""
48+
sentinelPassword: ""
49+
sentinelSecret: ""
4650
username: ""
4751
password: ""
4852
secret: ""

‎values.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,14 @@ global:
114114
host: "redis-master"
115115
# -- Scheme for the external redis. This can be redis, rediss, redis-socket or redis-sentinel
116116
scheme: "redis"
117+
# -- Redis Sentinel master name (required when scheme is redis-sentinel)
118+
sentinelMasterName: "mymaster"
119+
# -- Redis Sentinel auth username (optional)
120+
sentinelUsername: ""
121+
# -- Redis Sentinel auth password (optional)
122+
sentinelPassword: ""
123+
# -- Secret containing sentinel password; key: password. If set, sentinelPassword is ignored
124+
sentinelSecret: ""
117125
# -- username for the external redis.
118126
username: ""
119127
# -- password for the external redis, ignored in case of secret parameter with non-empty value

0 commit comments

Comments
 (0)