From 76221245360e969edb0d9a3ffdcc864f16b4e273 Mon Sep 17 00:00:00 2001
From: reinvantveer <rein.van.t.veer@geodan.nl>
Date: Mon, 12 Jul 2021 14:29:23 +0200
Subject: [PATCH] replace "define" templates with simple values now that
 controller.workflowNamespaces and workflow.namespace are unified into a
 single "range" iteration

Signed-off-by: reinvantveer <rein.van.t.veer@geodan.nl>
---
 .../templates/controller/workflow-sa.yaml            | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/charts/argo-workflows/templates/controller/workflow-sa.yaml b/charts/argo-workflows/templates/controller/workflow-sa.yaml
index b850d2ee..f35cd158 100644
--- a/charts/argo-workflows/templates/controller/workflow-sa.yaml
+++ b/charts/argo-workflows/templates/controller/workflow-sa.yaml
@@ -1,10 +1,3 @@
-{{- define "sa-base" }}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-{{- end }}
-
 {{- if .Values.workflow.serviceAccount.create -}}
 
   {{- /*
@@ -26,7 +19,10 @@ metadata:
   {{- end }}
 
   {{ range $namespace := append .Values.controller.workflowNamespaces .Values.workflow.namespace | compact | uniq }}
-    {{ include "sa-base" . }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
   name: {{ $.Values.workflow.serviceAccount.name }}
   namespace: {{ $namespace }}
   annotations: