Skip to content

Commit

Permalink
techdebt: [CDS-99063]: Allow support to overrdie redis-ha secret ref …
Browse files Browse the repository at this point in the history
…for auth to redis from agent
  • Loading branch information
ashinsabu3 committed Jul 30, 2024
1 parent 843ef9a commit 4f99157
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion templates/_common.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ Create redis name and version as used by the chart label.
{{- $redisHa := (index .Values "redis-ha") -}}
{{- if $redisHa.enabled -}}
{{- if $redisHa.haproxy.enabled -}}
{{- printf "%s-haproxy" ($redisHa.fullName) | trunc 63 | trimSuffix "-" -}}
{{- printf "%s-%s-haproxy" (index .Values "fullnameOverride") $redisHa.name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- else -}}
{{- printf "%s-%s" (include "argo-cd.fullname" .) .Values.redis.name | trunc 63 | trimSuffix "-" -}}
Expand Down
2 changes: 1 addition & 1 deletion templates/gitops-agent/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ spec:
name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }}
{{- if .Values.externalRedis.host }}
key: redis-password
optional: true
{{- else }}
key: auth
{{- end }}
optional: true
- name: REDIS_SENTINEL_USERNAME
valueFrom:
secretKeyRef:
Expand Down
4 changes: 3 additions & 1 deletion values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,9 @@ redis:
redis-ha:
enabled: false
# This value should be equal to redis-ha.fullname generated and set there from your redis-ha subchart
fullName: ""
# This will be used to get redis auth details from given secret name generated from this field
# Usually is the same as the value .Values.harness.configmap.argocd.redisHa
name: "redis-ha"
haproxy:
enabled: true
# -- Existing Secret to use for redis-ha authentication.
Expand Down

0 comments on commit 4f99157

Please sign in to comment.