From 586684bf065fe04bbd5e473d1611867994ef0a45 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Fri, 16 Aug 2024 14:27:54 +0200 Subject: [PATCH] fix: trim optional docker digest from version labels --- templates/_helpers.tpl | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index 71edcb9..234c839 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -32,6 +32,14 @@ Create chart name and version as used by the chart label. {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Get version from .Values.image.tag or Chart.AppVersion. +Trim optional docker digest. +*/}} +{{- define "gitea.version" -}} +{{- regexReplaceAll "@.+" (.Values.image.tag | default .Chart.AppVersion | toString) "" -}} +{{- end -}} + {{/* Create image name and tag used by the deployment. */}} @@ -87,8 +95,8 @@ Common labels helm.sh/chart: {{ include "gitea.chart" . }} app: {{ include "gitea.name" . }} {{ include "gitea.selectorLabels" . }} -app.kubernetes.io/version: {{ .Values.image.tag | default .Chart.AppVersion | quote }} -version: {{ .Values.image.tag | default .Chart.AppVersion | quote }} +app.kubernetes.io/version: {{ include "gitea.version" . | quote }} +version: {{ include "gitea.version" . | quote }} app.kubernetes.io/managed-by: {{ .Release.Service }} {{- end -}}