[charts/redis-ha] Correctly handle existing secret conditions for auth (#364)

* fix(redis-ha): Correctly handle existing secret conditions for auth in ServiceAccount

Signed-off-by: Aaron Layfield <[email protected]>

* chore(redis-ha): Bump chart version to 4.35.1

Signed-off-by: Aaron Layfield <[email protected]>

---------

Signed-off-by: Aaron Layfield <[email protected]>

Author: DandyDeveloper

charts/redis-ha/Chart.yaml

@@ -5,7 +5,7 @@ keywords:
 - redis
 - keyvalue
 - database
-version: 4.35.0
+version: 4.35.1
 appVersion: 8.2.2
 description: This Helm chart provides a highly available Redis implementation with a master/slave configuration and uses Sentinel sidecars for failover management
 icon: https://img.icons8.com/external-tal-revivo-shadow-tal-revivo/24/external-redis-an-in-memory-data-structure-project-implementing-a-distributed-logo-shadow-tal-revivo.png

charts/redis-ha/templates/redis-ha-serviceaccount.yaml

@@ -19,12 +19,16 @@ metadata:
 {{- if or .Values.auth .Values.sentinel.auth }}
 secrets:
 {{- end }}
+{{- if and (and (.Values.auth) (.Values.sentinel.auth)) (eq (.Values.existingSecret) (.Values.sentinel.existingSecret)) }}
+- name: {{ default (include "redis-ha.fullname" .) (tpl (.Values.existingSecret | default "" ) . ) }}
+{{- else }}
 {{- if .Values.auth }}
 - name: {{ default (include "redis-ha.fullname" .) (tpl (.Values.existingSecret | default "" ) . ) }}
 {{- end }}
 {{- if .Values.sentinel.auth }}
 - name: {{ default (printf "%s-sentinel" (include "redis-ha.fullname" .)) (tpl (.Values.sentinel.existingSecret | default "" ) . ) }}
 {{- end }}
+{{- end }}
 {{- if .Values.imagePullSecrets }}
 imagePullSecrets: {{ toYaml .Values.imagePullSecrets | nindent 0 }}
 {{- end }}