From 90c9eb50f95246701b1390ae9ad17aeadc5564bc Mon Sep 17 00:00:00 2001
From: Marco Franssen <marco.franssen@gmail.com>
Date: Wed, 17 May 2023 20:19:26 +0200
Subject: [PATCH] Fix kubectl-image macro to handle version deprecation

Signed-off-by: Marco Franssen <marco.franssen@gmail.com>
---
 charts/spire/charts/spire-server/templates/_helpers.tpl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/charts/spire/charts/spire-server/templates/_helpers.tpl b/charts/spire/charts/spire-server/templates/_helpers.tpl
index 2c7e45c..c085b4f 100644
--- a/charts/spire/charts/spire-server/templates/_helpers.tpl
+++ b/charts/spire/charts/spire-server/templates/_helpers.tpl
@@ -107,8 +107,9 @@ Create the name of the service account to use
 
 {{- define "spire-server.kubectl-image" }}
 {{- $root := deepCopy . }}
-{{- if eq (len $root.image.version) 0 }}
-{{- $_ := set $root.image "version" $root.KubeVersion }}
+{{- $tag := (default $root.image.tag $root.image.version) | toString }}
+{{- if eq (len $tag) 0 }}
+{{- $_ := set $root.image "tag" $root.KubeVersion }}
 {{- end }}
 {{- include "spire-lib.image" $root }}
 {{- end }}