From cc77911ab1cb32c7eee3a30093153978639fa3e0 Mon Sep 17 00:00:00 2001
From: Luke Robles <98352913+lrobles-iterable@users.noreply.github.com>
Date: Fri, 29 Apr 2022 11:37:02 -0700
Subject: [PATCH] fix helm chart for env vars

---
 helm/templates/deployment.yaml | 7 +++++--
 helm/values.yaml               | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
index 9ec84f86..7c166f95 100644
--- a/helm/templates/deployment.yaml
+++ b/helm/templates/deployment.yaml
@@ -38,9 +38,12 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
-          - name: PYTHONUNBUFFERED
-            value: "1"
           {{- range $key, $value := .Values.env }}
+          - name: {{ $key }}
+            value: "{{ $value }}"
+          {{- end }}
+
+          {{- range $key, $value := .Values.secrets }}
           - name: {{ $key }}
             valueFrom:
               secretKeyRef:
diff --git a/helm/values.yaml b/helm/values.yaml
index 0e39869e..2aa85030 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -8,7 +8,7 @@ image:
   repository: ldooks/dragon-bot
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "158"
+  tag: "159"
 
 imagePullSecrets: []
 nameOverride: ""
@@ -76,8 +76,11 @@ volumes:
   mountPath: /tmp/dale
 
 env:
+  DRAGON_ENV: prod
+  PYTHONUNBUFFERED: 1
+
+secrets:
   token: discord_token
   ffxiv_token: ffxiv_token
   gitlab_token: gitlab_token
   wolfram_token: wolfram_token
-  DRAGON_ENV: prod