From c9a426068e2af901412e4827e2ea47d9d1f6c81a Mon Sep 17 00:00:00 2001
From: Tom Powell <tom.powell@datadoghq.com>
Date: Wed, 24 Jul 2019 16:13:27 -0400
Subject: [PATCH] argo: add support for individual image tags. (#81)

---
 charts/argo/templates/ui-deployment.yaml              |  2 +-
 .../templates/workflow-controller-deployment.yaml     |  4 ++--
 charts/argo/values.yaml                               | 11 +++++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/charts/argo/templates/ui-deployment.yaml b/charts/argo/templates/ui-deployment.yaml
index c81d09ea..fda2a0d9 100644
--- a/charts/argo/templates/ui-deployment.yaml
+++ b/charts/argo/templates/ui-deployment.yaml
@@ -20,7 +20,7 @@ spec:
       serviceAccountName: {{ .Values.ui.serviceAccount | quote }}
       containers:
         - name: ui
-          image: "{{ .Values.images.namespace }}/{{ .Values.images.ui }}:{{ .Values.images.tag }}"
+          image: "{{ .Values.images.namespace }}/{{ .Values.images.ui }}:{{ default .Values.images.tag .Values.ui.image.tag }}"
           imagePullPolicy: {{ .Values.images.pullPolicy }}
           env:
           {{- if .Values.ui.forceNamespaceIsolation }}
diff --git a/charts/argo/templates/workflow-controller-deployment.yaml b/charts/argo/templates/workflow-controller-deployment.yaml
index bb489ba6..586d4132 100644
--- a/charts/argo/templates/workflow-controller-deployment.yaml
+++ b/charts/argo/templates/workflow-controller-deployment.yaml
@@ -20,14 +20,14 @@ spec:
       serviceAccountName: {{ .Values.controller.serviceAccount | quote }}
       containers:
         - name: controller
-          image: "{{ .Values.images.namespace }}/{{ .Values.images.controller }}:{{ .Values.images.tag }}"
+          image: "{{ .Values.images.namespace }}/{{ .Values.images.controller }}:{{ default .Values.images.tag .Values.controller.image.tag }}"
           imagePullPolicy: {{ .Values.images.pullPolicy }}
           command: [ "workflow-controller" ]
           args:
           - "--configmap"
           - "{{ .Release.Name }}-{{ .Values.controller.name}}-configmap"
           - "--executor-image"
-          - "{{ .Values.images.namespace }}/{{ .Values.images.executor }}:{{ .Values.images.tag }}"
+          - "{{ .Values.images.namespace }}/{{ .Values.images.executor }}:{{ default .Values.images.tag .Values.executor.image.tag }}"
           - "--loglevel"
           - "{{ .Values.controller.logging.level }}"
           - "--gloglevel"
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index 0db0db25..f4a60c10 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -16,6 +16,9 @@ init:
 createAggregateRoles: true
 
 controller:
+  image:
+    # Overrides .images.tag if defined.
+    tag: ""
   # podAnnotations is an optional map of annotations to be applied to the controller Pods
   podAnnotations: {}
   metricsConfig:
@@ -54,10 +57,18 @@ controller:
   # service type `LoadBalancer`
   loadBalancerSourceRanges: []
 
+executor:
+  image:
+    # Overrides .images.tag if defined.
+    tag: ""
+
 ui:
   enabled: true
   # only show workflows where UI installed
   forceNamespaceIsolation: false
+  image:
+    # Overrides .images.tag if defined.
+    tag: ""
   # optional map of annotations to be applied to the ui Pods
   podAnnotations: {}
   name: ui