From 8ab1e9b333676964fd3cd9fbb98670c5054d1f03 Mon Sep 17 00:00:00 2001
From: Rares Matei <matei.rar@gmail.com>
Date: Fri, 5 Jan 2024 18:03:10 +0000
Subject: [PATCH] remove quotes from env vars

---
 ...-cloud-workflow-controller-deployment.yaml | 31 ++++++++++++++++---
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/charts/nx-cloud/templates/nx-cloud-workflow-controller-deployment.yaml b/charts/nx-cloud/templates/nx-cloud-workflow-controller-deployment.yaml
index bdca9b4..65fe90d 100644
--- a/charts/nx-cloud/templates/nx-cloud-workflow-controller-deployment.yaml
+++ b/charts/nx-cloud/templates/nx-cloud-workflow-controller-deployment.yaml
@@ -26,7 +26,7 @@ spec:
           - --in-cluster=true
           - --image=nxprivatecloud/nx-cloud-build-tools:{{ .Values.nxCloudWorkflows.buildToolsImageTag }}
           {{- range $key, $value := .Values.nxCloudWorkflows.executorEnv }}
-          - --executor-env={{ $key }}={{ $value | quote }}
+          - --executor-env={{ $key }}={{ $value }}
           {{- end }}
           - --workflow-service-address=http://nx-cloud-workflow-controller-service:9000
           image: {{ include "nxCloud.images.nxCloudWorkflowController.image" . }}
@@ -55,10 +55,31 @@ spec:
             periodSeconds: 10
           {{- if gt (len .Values.nxCloudWorkflows.controllerEnv) 0 }}
           env:
-            {{- range $key, $value := .Values.nxCloudWorkflows.controllerEnv }}
-            - name: {{ $key | quote }}
-              value: {{ $value | quote }}
-            {{- end }}
+          {{- range $key, $value := .Values.nxCloudWorkflows.controllerEnv }}
+          - name: {{ $key | quote }}
+            value: {{ $value | quote }}
+          {{- end }}
+          {{- with .Values.secret }}
+          {{- if .awsS3AccessKeyId }}
+          {{- if .name }}
+          - name: AWS_S3_ACCESS_KEY_ID
+            valueFrom:
+              secretKeyRef:
+                name: {{ .name }}
+                key: {{ .awsS3AccessKeyId }}
+          - name: AWS_S3_SECRET_ACCESS_KEY
+            valueFrom:
+              secretKeyRef:
+                name: {{ .name }}
+                key: {{ .awsS3SecretAccessKey }}
+          {{- else }}
+          - name: SECRET_FILE_AWS_S3_ACCESS_KEY_ID
+            value: {{ .awsS3AccessKeyId }}
+          - name: SECRET_FILE_AWS_S3_SECRET_ACCESS_KEY
+            value: {{ .awsS3SecretAccessKey }}
+          {{- end }}
+          {{- end }}
+          {{- end }}
           {{- end }}
       serviceAccountName: nx-cloud-workflow-controller
       terminationGracePeriodSeconds: 10