From 1302a132d96806605d43e5c51805ff0f5be83bfd Mon Sep 17 00:00:00 2001
From: Chris Sng <chrissng@users.noreply.github.com>
Date: Mon, 2 Mar 2020 13:35:22 +0800
Subject: [PATCH] Allow configuring Argo executor

---
 charts/argo/Chart.yaml                                |  2 +-
 .../templates/workflow-controller-config-map.yaml     |  3 +++
 charts/argo/values.yaml                               | 11 ++++++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml
index 27b2d622..c9ae31f2 100644
--- a/charts/argo/Chart.yaml
+++ b/charts/argo/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "v2.4.3"
 description: A Helm chart for Argo Workflows
 name: argo
-version: 0.6.8
+version: 0.6.9
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:
diff --git a/charts/argo/templates/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml
index 43699820..5e24edef 100644
--- a/charts/argo/templates/workflow-controller-config-map.yaml
+++ b/charts/argo/templates/workflow-controller-config-map.yaml
@@ -46,3 +46,6 @@ data:
     {{- if .Values.controller.persistence }}
     persistence:
 {{ toYaml .Values.controller.persistence | indent 6 }}{{- end }}
+    {{- if .Values.controller.executor }}
+    executor:
+{{ toYaml .Values.controller.executor | indent 6}}{{- end }}
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index c41025b7..0e4b44c1 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -4,7 +4,7 @@ images:
   ui: argoui
   executor: argoexec
   pullPolicy: Always
-  tag: v2.4.3
+  tag: v2.6.0
 
 crdVersion: v1alpha1
 installCRD: true
@@ -25,6 +25,15 @@ controller:
   # Optional labels to add to the controller pods
   podLabels: {}
   # podPortName: http
+  executor:
+    imagePullPolicy: IfNotPresent
+    resources:
+      requests:
+        cpu: 0.1
+        memory: 64Mi
+      limits:
+        cpu: 0.5
+        memory: 512Mi
   metricsConfig:
     enabled: false
     path: /metrics