From 232e72efbce5917c42db094a178cae15cb5151c5 Mon Sep 17 00:00:00 2001
From: reinvantveer <reinvantveer@gmail.com>
Date: Wed, 14 Jul 2021 18:49:44 +0200
Subject: [PATCH] restore `with` blocks for service account name and service
 account annotations

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
---
 .../argo-workflows/templates/controller/workflow-sa.yaml  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/charts/argo-workflows/templates/controller/workflow-sa.yaml b/charts/argo-workflows/templates/controller/workflow-sa.yaml
index f35cd158..c3881e40 100644
--- a/charts/argo-workflows/templates/controller/workflow-sa.yaml
+++ b/charts/argo-workflows/templates/controller/workflow-sa.yaml
@@ -23,9 +23,13 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ $.Values.workflow.serviceAccount.name }}
+    {{- with $.Values.workflow.serviceAccount.name }}
+  name: {{ . }}
+    {{- end }}
   namespace: {{ $namespace }}
+    {{- with $.Values.workflow.serviceAccount.annotations }}
   annotations:
-    {{- toYaml $.Values.workflow.serviceAccount.annotations | nindent 4 }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- end }}
 {{- end }}