From 2fc0fb7e8b9b0302ba1de2e01e7078793b3717de Mon Sep 17 00:00:00 2001
From: David Vallee Delisle <me@dvd.dev>
Date: Tue, 26 Dec 2023 10:53:35 -0500
Subject: [PATCH] argo-events: Evaluating image values with tpl

We need to evaluate the image values to allow the use of external
values.

Related to argoproj/argo-helm#2305

Signed-off-by: David Vallee Delisle <me@dvd.dev>
---
 .../templates/argo-events-controller/config.yaml       | 10 +++++-----
 .../templates/argo-events-controller/deployment.yaml   |  6 +++---
 .../templates/argo-events-webhook/deployment.yaml      |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/charts/argo-events/templates/argo-events-controller/config.yaml b/charts/argo-events/templates/argo-events-controller/config.yaml
index b3293385..48d41150 100644
--- a/charts/argo-events/templates/argo-events-controller/config.yaml
+++ b/charts/argo-events/templates/argo-events-controller/config.yaml
@@ -13,8 +13,8 @@ data:
         versions:
         {{- range .Values.configs.nats.versions }}
         - version: {{ .version }}
-          natsStreamingImage: {{ .natsStreamingImage }}
-          metricsExporterImage: {{ .metricsExporterImage }}
+          natsStreamingImage: {{ tpl .natsStreamingImage $ }}
+          metricsExporterImage: {{ tpl .metricsExporterImage $ }}
         {{- end }}
       {{- end }}
       {{- if .Values.configs.jetstream.versions }}
@@ -35,9 +35,9 @@ data:
         versions:
         {{- range .Values.configs.jetstream.versions }}
         - version: {{ .version }}
-          natsImage: {{ .natsImage }}
-          metricsExporterImage: {{ .metricsExporterImage }}
-          configReloaderImage: {{ .configReloaderImage }}
+          natsImage: {{ tpl .natsImage $ }}
+          metricsExporterImage: {{ tpl .metricsExporterImage $ }}
+          configReloaderImage: {{ tpl .configReloaderImage $ }}
           startCommand: {{ .startCommand }}
         {{- end }}
       {{- end }}
diff --git a/charts/argo-events/templates/argo-events-controller/deployment.yaml b/charts/argo-events/templates/argo-events-controller/deployment.yaml
index a3614c73..8e5084a3 100644
--- a/charts/argo-events/templates/argo-events-controller/deployment.yaml
+++ b/charts/argo-events/templates/argo-events-controller/deployment.yaml
@@ -41,8 +41,8 @@ spec:
       {{- end }}
       containers:
       - name: {{ .Values.controller.name }}
-        image: {{ default .Values.global.image.repository .Values.controller.image.repository }}:{{ default (include "argo-events.defaultTag" .) .Values.controller.image.tag }}
-        imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.controller.image.imagePullPolicy }}
+        image: {{ tpl (default .Values.global.image.repository .Values.controller.image.repository) . }}:{{ tpl (default (include "argo-events.defaultTag" .) .Values.controller.image.tag) . }}
+        imagePullPolicy: {{ tpl (default .Values.global.image.imagePullPolicy .Values.controller.image.imagePullPolicy) . }}
         args:
         - controller
         {{- if .Values.controller.rbac.namespaced }}
@@ -58,7 +58,7 @@ spec:
         {{- end }}
         env:
         - name: ARGO_EVENTS_IMAGE
-          value: {{ default .Values.global.image.repository .Values.controller.image.repository }}:{{ default (include "argo-events.defaultTag" .) .Values.controller.image.tag }}
+          value: {{ tpl (default .Values.global.image.repository .Values.controller.image.repository) . }}:{{ tpl (default (include "argo-events.defaultTag" .) .Values.controller.image.tag) . }}
         - name: NAMESPACE
           valueFrom:
             fieldRef:
diff --git a/charts/argo-events/templates/argo-events-webhook/deployment.yaml b/charts/argo-events/templates/argo-events-webhook/deployment.yaml
index 0445484e..a943d3dc 100644
--- a/charts/argo-events/templates/argo-events-webhook/deployment.yaml
+++ b/charts/argo-events/templates/argo-events-webhook/deployment.yaml
@@ -41,8 +41,8 @@ spec:
       {{- end }}
       containers:
       - name: {{ .Values.webhook.name }}
-        image: {{ default .Values.global.image.repository .Values.webhook.image.repository }}:{{ default (include "argo-events.defaultTag" .) .Values.webhook.image.tag }}
-        imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.webhook.image.imagePullPolicy }}
+        image: {{ tpl (default .Values.global.image.repository .Values.webhook.image.repository) . }}:{{ tpl (default (include "argo-events.defaultTag" .) .Values.webhook.image.tag) . }}
+        imagePullPolicy: {{ tpl (default .Values.global.image.imagePullPolicy .Values.webhook.image.imagePullPolicy) . }}
         args:
         - webhook-service
         {{- with .Values.webhook.containerSecurityContext }}