Skip to content

add redis sentinel configurations #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
olamilekan000 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

add redis sentinel configurations #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions charts/agent/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,26 @@ spec:
{{- if .Values.global.externalRedis.addresses }}
- name: CONVOY_REDIS_CLUSTER_ADDRESSES
value: {{ .Values.global.externalRedis.addresses | quote }}
{{- if eq .Values.global.externalRedis.scheme "redis-sentinel" }}
- name: CONVOY_REDIS_SCHEME
value: {{ .Values.global.externalRedis.scheme | quote }}
- name: CONVOY_REDIS_SENTINEL_MASTER_NAME
value: {{ .Values.global.externalRedis.sentinelMasterName | default "mymaster" | quote }}
{{- if ne .Values.global.externalRedis.sentinelSecret "" }}
- name: CONVOY_REDIS_SENTINEL_PASSWORD
valueFrom:
secretKeyRef:
name: "{{ .Values.global.externalRedis.sentinelSecret }}"
key: password
{{- else if .Values.global.externalRedis.sentinelPassword }}
- name: CONVOY_REDIS_SENTINEL_PASSWORD
value: {{ .Values.global.externalRedis.sentinelPassword | quote }}
{{- end }}
{{- if .Values.global.externalRedis.sentinelUsername }}
- name: CONVOY_REDIS_SENTINEL_USERNAME
value: {{ .Values.global.externalRedis.sentinelUsername | quote }}
{{- end }}
{{- end }}
{{- else }}
- name: CONVOY_REDIS_TYPE
value: "EXTERNAL"
Expand All @@ -185,6 +205,24 @@ spec:
value: {{ .Values.global.externalRedis.username | quote }}
- name: CONVOY_REDIS_DATABASE
value: {{ .Values.global.externalRedis.database | quote }}
{{- if eq .Values.global.externalRedis.scheme "redis-sentinel" }}
- name: CONVOY_REDIS_SENTINEL_MASTER_NAME
value: {{ .Values.global.externalRedis.sentinelMasterName | default "mymaster" | quote }}
{{- if ne .Values.global.externalRedis.sentinelSecret "" }}
- name: CONVOY_REDIS_SENTINEL_PASSWORD
valueFrom:
secretKeyRef:
name: "{{ .Values.global.externalRedis.sentinelSecret }}"
key: password
{{- else if .Values.global.externalRedis.sentinelPassword }}
- name: CONVOY_REDIS_SENTINEL_PASSWORD
value: {{ .Values.global.externalRedis.sentinelPassword | quote }}
{{- end }}
{{- if .Values.global.externalRedis.sentinelUsername }}
- name: CONVOY_REDIS_SENTINEL_USERNAME
value: {{ .Values.global.externalRedis.sentinelUsername | quote }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}

Expand Down
4 changes: 4 additions & 0 deletions charts/agent/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ global:
addresses: ""
host: "redis-master"
scheme: "redis"
sentinelMasterName: "mymaster"
sentinelUsername: ""
sentinelPassword: ""
sentinelSecret: ""
username: ""
password: ""
secret: ""
Expand Down
38 changes: 38 additions & 0 deletions charts/server/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,26 @@ spec:
{{- if .Values.global.externalRedis.addresses }}
- name: CONVOY_REDIS_CLUSTER_ADDRESSES
value: {{ .Values.global.externalRedis.addresses | quote }}
{{- if eq .Values.global.externalRedis.scheme "redis-sentinel" }}
- name: CONVOY_REDIS_SCHEME
value: {{ .Values.global.externalRedis.scheme | quote }}
- name: CONVOY_REDIS_SENTINEL_MASTER_NAME
value: {{ .Values.global.externalRedis.sentinelMasterName | default "mymaster" | quote }}
{{- if ne .Values.global.externalRedis.sentinelSecret "" }}
- name: CONVOY_REDIS_SENTINEL_PASSWORD
valueFrom:
secretKeyRef:
name: "{{ .Values.global.externalRedis.sentinelSecret }}"
key: password
{{- else if .Values.global.externalRedis.sentinelPassword }}
- name: CONVOY_REDIS_SENTINEL_PASSWORD
value: {{ .Values.global.externalRedis.sentinelPassword | quote }}
{{- end }}
{{- if .Values.global.externalRedis.sentinelUsername }}
- name: CONVOY_REDIS_SENTINEL_USERNAME
value: {{ .Values.global.externalRedis.sentinelUsername | quote }}
{{- end }}
{{- end }}
{{- else }}
- name: CONVOY_REDIS_TYPE
value: "EXTERNAL"
Expand All @@ -222,6 +242,24 @@ spec:
value: {{ .Values.global.externalRedis.username | quote }}
- name: CONVOY_REDIS_DATABASE
value: {{ .Values.global.externalRedis.database | quote }}
{{- if eq .Values.global.externalRedis.scheme "redis-sentinel" }}
- name: CONVOY_REDIS_SENTINEL_MASTER_NAME
value: {{ .Values.global.externalRedis.sentinelMasterName | default "mymaster" | quote }}
{{- if ne .Values.global.externalRedis.sentinelSecret "" }}
- name: CONVOY_REDIS_SENTINEL_PASSWORD
valueFrom:
secretKeyRef:
name: "{{ .Values.global.externalRedis.sentinelSecret }}"
key: password
{{- else if .Values.global.externalRedis.sentinelPassword }}
- name: CONVOY_REDIS_SENTINEL_PASSWORD
value: {{ .Values.global.externalRedis.sentinelPassword | quote }}
{{- end }}
{{- if .Values.global.externalRedis.sentinelUsername }}
- name: CONVOY_REDIS_SENTINEL_USERNAME
value: {{ .Values.global.externalRedis.sentinelUsername | quote }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}

Expand Down
4 changes: 4 additions & 0 deletions charts/server/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ global:
addresses: ""
host: "redis-master"
scheme: "redis"
sentinelMasterName: "mymaster"
sentinelUsername: ""
sentinelPassword: ""
sentinelSecret: ""
username: ""
password: ""
secret: ""
Expand Down
8 changes: 8 additions & 0 deletions values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,14 @@ global:
host: "redis-master"
# -- Scheme for the external redis. This can be redis, rediss, redis-socket or redis-sentinel
scheme: "redis"
# -- Redis Sentinel master name (required when scheme is redis-sentinel)
sentinelMasterName: "mymaster"
# -- Redis Sentinel auth username (optional)
sentinelUsername: ""
# -- Redis Sentinel auth password (optional)
sentinelPassword: ""
# -- Secret containing sentinel password; key: password. If set, sentinelPassword is ignored
sentinelSecret: ""
# -- username for the external redis.
username: ""
# -- password for the external redis, ignored in case of secret parameter with non-empty value
Expand Down
Loading