From 36c68d3c09002501c0f455c83a24bd1b822b120b Mon Sep 17 00:00:00 2001
From: pat-s <patrick.schratz@gmail.com>
Date: Thu, 2 May 2024 08:05:26 +0000
Subject: [PATCH] Quote image tag (#641)

fix #631

Co-authored-by: justusbunsi <sk.bunsenbrenner@gmail.com>
Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/641
Co-authored-by: pat-s <patrick.schratz@gmail.com>
Co-committed-by: pat-s <patrick.schratz@gmail.com>
(cherry picked from commit 0b2f3d6eb9c2aebf4473dd98dbd3cf558d2ecf0c)

Conflicts:
 unittests/deployment/image-configuration.yaml
---
 templates/_helpers.tpl                        |  2 +-
 unittests/deployment/image-configuration.yaml | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index dc76158..c15c8ee 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -60,7 +60,7 @@ Create image name and tag used by the deployment.
 {{- $registry := .Values.global.imageRegistry | default .Values.image.registry -}}
 {{- $repository := .Values.image.repository -}}
 {{- $separator := ":" -}}
-{{- $tag := .Values.image.tag | default .Chart.AppVersion -}}
+{{- $tag := .Values.image.tag | default .Chart.AppVersion | toString -}}
 {{- $rootless := ternary "-rootless" "" (.Values.image.rootless) -}}
 {{- $digest := "" -}}
 {{- if .Values.image.digest }}
diff --git a/unittests/deployment/image-configuration.yaml b/unittests/deployment/image-configuration.yaml
index ab63f3d..9d15f54 100644
--- a/unittests/deployment/image-configuration.yaml
+++ b/unittests/deployment/image-configuration.yaml
@@ -91,3 +91,20 @@ tests:
       - equal:
           path: spec.template.spec.containers[0].image
           value: 'global.example.com/forgejo/forgejo:1.19.3-rootless@sha256:b28e8f3089b52ebe6693295df142f8c12eff354e9a4a5bfbb5c10f296c3a537a'
+  - it: correctly renders floating tag references
+    template: templates/gitea/deployment.yaml
+    set:
+      image.tag: 1.21 # use non-quoted value on purpose. See: https://gitea.com/gitea/helm-chart/issues/631
+    asserts:
+      - equal:
+          path: spec.template.spec.initContainers[0].image
+          value: 'codeberg.org/forgejo/forgejo:1.21-rootless'
+      - equal:
+          path: spec.template.spec.initContainers[1].image
+          value: 'codeberg.org/forgejo/forgejo:1.21-rootless'
+      - equal:
+          path: spec.template.spec.initContainers[2].image
+          value: 'codeberg.org/forgejo/forgejo:1.21-rootless'
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: 'codeberg.org/forgejo/forgejo:1.21-rootless'