diff --git a/charts/agent/templates/deployment.yaml b/charts/agent/templates/deployment.yaml index 9a031d3..9d7ca40 100755 --- a/charts/agent/templates/deployment.yaml +++ b/charts/agent/templates/deployment.yaml @@ -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" @@ -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 }} diff --git a/charts/agent/values.yaml b/charts/agent/values.yaml index f70ea86..10c0ffe 100755 --- a/charts/agent/values.yaml +++ b/charts/agent/values.yaml @@ -42,6 +42,10 @@ global: addresses: "" host: "redis-master" scheme: "redis" + sentinelMasterName: "mymaster" + sentinelUsername: "" + sentinelPassword: "" + sentinelSecret: "" username: "" password: "" secret: "" diff --git a/charts/server/templates/deployment.yaml b/charts/server/templates/deployment.yaml index dc39d13..d93d3d6 100755 --- a/charts/server/templates/deployment.yaml +++ b/charts/server/templates/deployment.yaml @@ -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" @@ -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 }} diff --git a/charts/server/values.yaml b/charts/server/values.yaml index d185747..13cd90c 100755 --- a/charts/server/values.yaml +++ b/charts/server/values.yaml @@ -43,6 +43,10 @@ global: addresses: "" host: "redis-master" scheme: "redis" + sentinelMasterName: "mymaster" + sentinelUsername: "" + sentinelPassword: "" + sentinelSecret: "" username: "" password: "" secret: "" diff --git a/values.yaml b/values.yaml index a434141..27eb0ff 100755 --- a/values.yaml +++ b/values.yaml @@ -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