From 729d98a2b92b61ec9510abed60cae47bd3a5314b Mon Sep 17 00:00:00 2001
From: Peejai <pieterjan.soetaert@robovision.eu>
Date: Mon, 8 May 2023 10:45:57 +0200
Subject: [PATCH] Fix helm linting and unset defaults

Signed-off-by: Peejai <pieterjan.soetaert@robovision.eu>
---
 .../controller/workflow-controller-config-map.yaml   | 12 ++++++------
 charts/argo-workflows/values.yaml                    |  4 ++--
 2 files changed, 8 insertions(+), 8 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 ab001847..d997687f 100644
--- a/charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml
+++ b/charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml
@@ -69,14 +69,14 @@ data:
       s3:
         {{- if .Values.useStaticCredentials }}
         accessKeySecret:
-          key: {{ tpl .Values.artifactRepository.s3.accessKeySecret.key $ }}
-          name: {{ tpl .Values.artifactRepository.s3.accessKeySecret.name $ }}
+          key: {{ tpl .Values.artifactRepository.s3.accessKeySecret.key . }}
+          name: {{ tpl .Values.artifactRepository.s3.accessKeySecret.name . }}
         secretKeySecret:
-          key: {{ tpl .Values.artifactRepository.s3.secretKeySecret.key $ }}
-          name: {{ tpl .Values.artifactRepository.s3.secretKeySecret.name $ }}
+          key: {{ tpl .Values.artifactRepository.s3.secretKeySecret.key . }}
+          name: {{ tpl .Values.artifactRepository.s3.secretKeySecret.name . }}
         {{- end }}
-        bucket: {{ tpl .Values.artifactRepository.s3.bucket $ }}
-        endpoint: {{ tpl .Values.artifactRepository.s3.endpoint $ }}
+        bucket: {{ tpl (.Values.artifactRepository.s3.bucket | default "") . }}
+        endpoint: {{ tpl (.Values.artifactRepository.s3.endpoint | default "") . }}
         insecure: {{ .Values.artifactRepository.s3.insecure }}
         {{- if .Values.artifactRepository.s3.keyFormat }}
         keyFormat: {{ .Values.artifactRepository.s3.keyFormat | quote }}
diff --git a/charts/argo-workflows/values.yaml b/charts/argo-workflows/values.yaml
index c1c0229e..775ab01a 100644
--- a/charts/argo-workflows/values.yaml
+++ b/charts/argo-workflows/values.yaml
@@ -650,10 +650,10 @@ artifactRepository:
     # Note the `key` attribute is not the actual secret, it's the PATH to
     # the contents in the associated secret, as defined by the `name` attribute.
     accessKeySecret:
-      # name: <releaseName>-minio
+      name: "{{ .Release.Name }}-minio"
       key: accesskey
     secretKeySecret:
-      # name: <releaseName>-minio
+      name: "{{ .Release.Name }}-minio"
       key: secretkey
     # insecure will disable TLS. Primarily used for minio installs not configured with TLS
     insecure: false