From 51ce767696da64e66fbe4e91e66f63a102c3c450 Mon Sep 17 00:00:00 2001
From: Wajih Yassine <54372074+wajihyassine@users.noreply.github.com>
Date: Tue, 16 Apr 2024 08:52:58 -0700
Subject: [PATCH] Yeti Tasks environment variables fix (#138)

---
 charts/yeti/Chart.yaml                      |  2 +-
 charts/yeti/templates/_env.tpl              | 26 +++++++++++++++++++++
 charts/yeti/templates/api-deployment.yaml   | 26 ---------------------
 charts/yeti/templates/tasks-deployment.yaml |  5 ----
 4 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/charts/yeti/Chart.yaml b/charts/yeti/Chart.yaml
index a565bf48..6b5b52fb 100644
--- a/charts/yeti/Chart.yaml
+++ b/charts/yeti/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: yeti
-version: 1.0.1
+version: 1.0.2
 description: A Helm chart for Yeti Kubernetes deployments.
 keywords:
 - yeti
diff --git a/charts/yeti/templates/_env.tpl b/charts/yeti/templates/_env.tpl
index 0b0d1fa2..f6730c3b 100644
--- a/charts/yeti/templates/_env.tpl
+++ b/charts/yeti/templates/_env.tpl
@@ -28,4 +28,30 @@ Worker pod upon startup.
   value: "True"
 - name: YETI_SYSTEM_PLUGINS_PATH
   value: "./plugins"
+- name: YETI_USER_PASSWORD
+  valueFrom:
+    secretKeyRef:
+      name: {{ include "yeti.fullname" . }}-secret 
+      key: yeti-user
+- name: YETI_ARANGODB_PASSWORD
+  valueFrom:
+    secretKeyRef:
+      name: {{ include "yeti.fullname" . }}-secret 
+      key: yeti-arangodb
+- name: YETI_API_KEY
+  valueFrom:
+    secretKeyRef:
+      name: {{ include "yeti.fullname" . }}-secret 
+      key: yeti-api
+{{- if .Values.global.timesketch.enabled }}
+- name: YETI_TIMESKETCH_ENDPOINT
+  value: {{ printf "http://%s-timesketch:%.0f" .Release.Name .Values.global.timesketch.servicePort | quote }}
+- name: YETI_TIMESKETCH_USERNAME
+  value: timesketch
+- name: YETI_TIMESKETCH_PASSWORD
+  valueFrom:
+    secretKeyRef:
+      name: {{ printf "%s-timesketch-secret" .Release.Name | quote }}
+      key: timesketch-user
+{{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/yeti/templates/api-deployment.yaml b/charts/yeti/templates/api-deployment.yaml
index 0ad9a160..bb333c25 100644
--- a/charts/yeti/templates/api-deployment.yaml
+++ b/charts/yeti/templates/api-deployment.yaml
@@ -41,32 +41,6 @@ spec:
                 command: ["sh", "-c", "poetry run python yetictl/cli.py create-user yeti $YETI_USER_PASSWORD --api_key $YETI_API_KEY --admin"]
           env:
           {{- include "yeti.envs" . | nindent 12 }}
-            - name: YETI_USER_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "yeti.fullname" . }}-secret 
-                  key: yeti-user
-            - name: YETI_ARANGODB_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "yeti.fullname" . }}-secret 
-                  key: yeti-arangodb
-            - name: YETI_API_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "yeti.fullname" . }}-secret 
-                  key: yeti-api
-            {{- if .Values.global.timesketch.enabled }}
-            - name: YETI_TIMESKETCH_ENDPOINT
-              value: {{ printf "http://%s-timesketch:%.0f" .Release.Name .Values.global.timesketch.servicePort | quote }}
-            - name: YETI_TIMESKETCH_USERNAME
-              value: timesketch
-            - name: YETI_TIMESKETCH_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ printf "%s-timesketch-secret" .Release.Name | quote }}
-                  key: timesketch-user
-            {{- end }}
           volumeMounts:
             - mountPath: /mnt/yeti
               name: yetivolume
diff --git a/charts/yeti/templates/tasks-deployment.yaml b/charts/yeti/templates/tasks-deployment.yaml
index 62eb68e0..ef7f3861 100644
--- a/charts/yeti/templates/tasks-deployment.yaml
+++ b/charts/yeti/templates/tasks-deployment.yaml
@@ -37,11 +37,6 @@ spec:
           command: ["sh", "-c", "/docker-entrypoint.sh tasks"]
           env:
           {{- include "yeti.envs" . | nindent 12 }}
-            - name: YETI_ARANGODB_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "yeti.fullname" . }}-secret 
-                  key: yeti-arangodb
           volumeMounts:
             - mountPath: /mnt/yeti
               name: yetivolume