From 03defd84373faf1dde65a6f41e0cbb553bd0fd0b Mon Sep 17 00:00:00 2001
From: Andrew Chubatiuk <andrew.chubatiuk@gmail.com>
Date: Sat, 13 Apr 2024 01:08:55 +0300
Subject: [PATCH] apply self managed credentials for external db and cache only

---
 charts/redash/Chart.yaml             | 2 +-
 charts/redash/templates/_helpers.tpl | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/charts/redash/Chart.yaml b/charts/redash/Chart.yaml
index 2d2db33..44dd35d 100644
--- a/charts/redash/Chart.yaml
+++ b/charts/redash/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: redash
-version: 3.1.0-alpha2
+version: 3.1.0-alpha3
 appVersion: 24.04.0-dev-b8665145752.21
 description: Redash is an open source tool built for teams to query, visualize and collaborate.
 keywords:
diff --git a/charts/redash/templates/_helpers.tpl b/charts/redash/templates/_helpers.tpl
index bd2ab7d..1ac08e6 100644
--- a/charts/redash/templates/_helpers.tpl
+++ b/charts/redash/templates/_helpers.tpl
@@ -75,8 +75,8 @@ Get the secret name.
 Shared environment block used across each component.
 */}}
 {{- define "redash.env" -}}
-{{- if not .Values.redash.selfManagedSecrets -}}
 {{- if not .Values.postgresql.enabled -}}
+{{- if not .Values.redash.selfManagedSecrets -}}
 - name: REDASH_DATABASE_URL
   {{- if .Values.externalPostgreSQLSecret }}
   valueFrom:
@@ -84,6 +84,7 @@ Shared environment block used across each component.
   {{- else }}
   value: {{ default "" .Values.externalPostgreSQL | quote }}
   {{- end }}
+{{- end }}
 {{- else -}}
 - name: REDASH_DATABASE_USER
   value: {{ .Values.postgresql.auth.username | quote }}
@@ -100,6 +101,7 @@ Shared environment block used across each component.
   value: {{ .Values.postgresql.auth.database | quote }}
 {{- end -}}
 {{- if not .Values.redis.enabled }}
+{{- if not .Values.redash.selfManagedSecrets -}}
 - name: REDASH_REDIS_URL
   {{- if .Values.externalRedisSecret }}
   valueFrom:
@@ -107,6 +109,7 @@ Shared environment block used across each component.
   {{- else }}
   value: {{ default "" .Values.externalRedis | quote }}
   {{- end }}
+{{- end }}
 {{- else }}
 - name: REDASH_REDIS_PASSWORD
   valueFrom:
@@ -124,7 +127,6 @@ Shared environment block used across each component.
 - name: REDASH_REDIS_NAME
   value: {{ .Values.redis.database | quote }}
 {{ end -}}
-{{- end -}}
 {{ range $key, $value := .Values.env -}}
 - name: {{ $key | quote }}
   value: {{ $value | quote }}