Merge pull request #18 from broadinstitute/benb/revert_back_to_functi…

…on_and_fix_whitespace Revert back to function and fix bad whitespace.
broadinstitute · Aug 18, 2023 · cfb8c92 · cfb8c92
2 parents 2c13ee8 + 174e4df
commit cfb8c92
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 32 deletions.
diff --git 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.

diff --git 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
@@ -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: