From ea525e7e3366d6394b1c9d1ea17e2acae1a8d962 Mon Sep 17 00:00:00 2001
From: Benjamin Blankenmeister <bblanken@broadinstitute.org>
Date: Tue, 1 Aug 2023 15:32:44 -0400
Subject: [PATCH 1/2] Revert back to function and fix whitespace

---
 charts/seqr/templates/_helpers.tpl    |  4 ++--
 charts/seqr/templates/deployment.yaml | 30 +--------------------------
 2 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/charts/seqr/templates/_helpers.tpl b/charts/seqr/templates/_helpers.tpl
index 40f3dbdc..1519f844 100644
--- a/charts/seqr/templates/_helpers.tpl
+++ b/charts/seqr/templates/_helpers.tpl
@@ -55,8 +55,8 @@ Seqr environment shared between application and cron
 */}}
 {{- define "seqr.environment" -}}
 envFrom:
-- configMapRef:
-   name: {{ .Release.Name }}-environment
+  - configMapRef:
+    name: {{ .Release.Name }}-environment
 env:
   - name: POSTGRES_PASSWORD
     valueFrom:
diff --git a/charts/seqr/templates/deployment.yaml b/charts/seqr/templates/deployment.yaml
index a31486ad..7b0e55a5 100644
--- a/charts/seqr/templates/deployment.yaml
+++ b/charts/seqr/templates/deployment.yaml
@@ -45,35 +45,7 @@ spec:
         {{- end }}
         resources:
           {{- toYaml .Values.resources | nindent 10 }}
-        envFrom:
-          - configMapRef:
-              name: {{ .Release.Name }}-environment
-        env:
-          - name: POSTGRES_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ .Values.required_secrets.postgresSecretName }}
-                key: password
-          - name: DJANGO_KEY
-            valueFrom:
-              secretKeyRef:
-                name: {{ .Values.required_secrets.seqrSecretName }}
-                key: django_key
-          {{- if .Values.enable_elasticsearch_auth }}
-          - name: SEQR_ES_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ .Values.required_secrets.seqrSecretName }}
-                key: seqr_es_password
-          - name: KIBANA_ES_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ .Values.required_secrets.kibanaSecretName }}
-                key: elasticsearch.password
-          {{- end }}
-          {{- with .Values.additional_secrets }}
-            {{- toYaml . | nindent 10 }}
-          {{- end }}
+        {{- include "seqr.environment" $ | nindent 8 }}
         readinessProbe:
           exec:
             command:

From 174e4df65f12c9dcb41dfceb98fd1175fa39458e Mon Sep 17 00:00:00 2001
From: Benjamin Blankenmeister <bblanken@broadinstitute.org>
Date: Tue, 1 Aug 2023 15:33:21 -0400
Subject: [PATCH 2/2] Bump version

---
 charts/seqr/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/seqr/Chart.yaml b/charts/seqr/Chart.yaml
index 76a2a8ad..031ae56f 100644
--- a/charts/seqr/Chart.yaml
+++ b/charts/seqr/Chart.yaml
@@ -17,7 +17,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.36
+version: 0.0.37
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.