From 87999085bbbc8dcea66550c24196d7901ca69cc5 Mon Sep 17 00:00:00 2001
From: Kristof Farkas-Pall <kristofarkas@gmail.com>
Date: Mon, 16 Mar 2020 12:02:55 +0000
Subject: [PATCH] Bump version, add SA annotation and exec resources

---
 charts/argo/Chart.yaml                                    | 2 +-
 charts/argo/templates/server-sa.yaml                      | 2 ++
 charts/argo/templates/workflow-controller-config-map.yaml | 5 +++++
 charts/argo/templates/workflow-controller-sa.yaml         | 2 ++
 charts/argo/values.yaml                                   | 7 ++++++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml
index 33604dcb..88bdf3d4 100644
--- a/charts/argo/Chart.yaml
+++ b/charts/argo/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "v2.6.1"
+appVersion: "v2.6.2"
 description: A Helm chart for Argo Workflows
 name: argo
 version: 0.7.3
diff --git a/charts/argo/templates/server-sa.yaml b/charts/argo/templates/server-sa.yaml
index 8027811e..2d99df48 100644
--- a/charts/argo/templates/server-sa.yaml
+++ b/charts/argo/templates/server-sa.yaml
@@ -3,4 +3,6 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ .Values.server.serviceAccount }}
+  annotations:
+{{ toYaml .Values.server.serviceAccountAnnotation | indent 4 }}
 {{- end -}}
diff --git a/charts/argo/templates/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml
index 43699820..b8b163c1 100644
--- a/charts/argo/templates/workflow-controller-config-map.yaml
+++ b/charts/argo/templates/workflow-controller-config-map.yaml
@@ -16,6 +16,11 @@ data:
     {{- end }}
     {{- end }}
     containerRuntimeExecutor: {{ .Values.controller.containerRuntimeExecutor }}
+    {{- with .Values.executor.resources }}
+    executor:
+      resources:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
     artifactRepository:
       {{- if or .Values.minio.install .Values.useDefaultArtifactRepo }}
       {{- if .Values.artifactRepository.archiveLogs }}
diff --git a/charts/argo/templates/workflow-controller-sa.yaml b/charts/argo/templates/workflow-controller-sa.yaml
index af3ef519..e9134be8 100644
--- a/charts/argo/templates/workflow-controller-sa.yaml
+++ b/charts/argo/templates/workflow-controller-sa.yaml
@@ -2,3 +2,5 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ .Values.controller.serviceAccount }}
+  annotations:
+{{ toYaml .Values.controller.serviceAccountAnnotation | indent 4 }}
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index ba37d1be..35742827 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -4,7 +4,7 @@ images:
   server: argocli
   executor: argoexec
   pullPolicy: Always
-  tag: v2.6.1
+  tag: v2.6.2
 
 crdVersion: v1alpha1
 installCRD: true
@@ -59,6 +59,8 @@ controller:
     enabled: false
     additionalLabels: {}
   serviceAccount: argo
+  # Service account annotations
+  serviceAccountAnnotation: {}
   name: workflow-controller
   workflowNamespaces:
     - default
@@ -103,6 +105,7 @@ executor:
   image:
     # Overrides .images.tag if defined.
     tag: ""
+  resources: {}
 
 server:
   enabled: true
@@ -124,6 +127,8 @@ server:
   servicePort: 2746
   # servicePortName: http
   serviceAccount: argo-server
+  # Service account annotations
+  serviceAccountAnnotation: {}
   # Annotations to be applied to the UI Service
   serviceAnnotations: {}
   # Optional labels to add to the UI Service