From cc6c3e096217f829e2632d241be24186bbd01fa6 Mon Sep 17 00:00:00 2001
From: PidgeyBE <pidgey.be@gmail.com>
Date: Fri, 5 May 2023 14:00:18 +0200
Subject: [PATCH] Allow templating in S3 config

Signed-off-by: PidgeyBE <pidgey.be@gmail.com>
Signed-off-by: Peejai <pieterjan.soetaert@robovision.eu>
---
 .../controller/workflow-controller-config-map.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml b/charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml
index 55720eb2..ab001847 100644
--- a/charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml
+++ b/charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml
@@ -69,20 +69,20 @@ data:
       s3:
         {{- if .Values.useStaticCredentials }}
         accessKeySecret:
-          key: {{ .Values.artifactRepository.s3.accessKeySecret.key }}
-          name: {{ .Values.artifactRepository.s3.accessKeySecret.name }}
+          key: {{ tpl .Values.artifactRepository.s3.accessKeySecret.key $ }}
+          name: {{ tpl .Values.artifactRepository.s3.accessKeySecret.name $ }}
         secretKeySecret:
-          key: {{ .Values.artifactRepository.s3.secretKeySecret.key }}
-          name: {{ .Values.artifactRepository.s3.secretKeySecret.name }}
+          key: {{ tpl .Values.artifactRepository.s3.secretKeySecret.key $ }}
+          name: {{ tpl .Values.artifactRepository.s3.secretKeySecret.name $ }}
         {{- end }}
-        bucket: {{ .Values.artifactRepository.s3.bucket }}
-        endpoint: {{ .Values.artifactRepository.s3.endpoint }}
+        bucket: {{ tpl .Values.artifactRepository.s3.bucket $ }}
+        endpoint: {{ tpl .Values.artifactRepository.s3.endpoint $ }}
         insecure: {{ .Values.artifactRepository.s3.insecure }}
         {{- if .Values.artifactRepository.s3.keyFormat }}
         keyFormat: {{ .Values.artifactRepository.s3.keyFormat | quote }}
         {{- end }}
         {{- if .Values.artifactRepository.s3.region }}
-        region: {{ .Values.artifactRepository.s3.region }}
+        region: {{ tpl .Values.artifactRepository.s3.region $ }}
         {{- end }}
         {{- if .Values.artifactRepository.s3.roleARN }}
         roleARN: {{ .Values.artifactRepository.s3.roleARN }}