Ensure version tag matches deployed version

When overriding `image.tag` the version label should also show the
correct version. Previously, the label would always be AppVersion, even
if the user had provided a different image tag (thus deploying a
different Nextcloud version).

With this change, the version is always first derived from the image tag
and only from AppVersion if not tag was provided. For the
"nextcloud.image" helper this was already the case, now the "version"
label on all resources also does this.

Signed-off-by: Florian Ruechel <code@inexplicity.de>

Author: Javex

charts/nextcloud/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: nextcloud
-version: 8.6.0
+version: 8.7.0
 # renovate: image=docker.io/library/nextcloud
 appVersion: 32.0.2
 description: A file sharing server that puts the control and security of your own data back into your hands.

charts/nextcloud/templates/_helpers.tpl

@@ -42,11 +42,14 @@ Create chart name and version as used by the chart label.
 Create image name that is used in the deployment
 */}}
 {{- define "nextcloud.image" -}}
-{{- if .Values.image.tag -}}
-{{- printf "%s/%s:%s" (coalesce .Values.global.image.registry .Values.image.registry) .Values.image.repository .Values.image.tag -}}
-{{- else -}}
-{{- printf "%s/%s:%s-%s" (coalesce .Values.global.image.registry .Values.image.registry) .Values.image.repository .Chart.AppVersion .Values.image.flavor -}}
+{{- printf "%s/%s:%s" (coalesce .Values.global.image.registry .Values.image.registry) .Values.image.repository (include "nextcloud.version" .) -}}
 {{- end -}}
+
+{{/*
+Return Nextcloud version from either image tag or AppVersion
+*/}}
+{{- define "nextcloud.version" -}}
+{{- .Values.image.tag | default .Chart.AppVersion }}
 {{- end -}}
 
 
@@ -445,7 +448,7 @@ Parameters:
 {{ include "nextcloud.selectorLabels" ( dict "component" .component "rootContext" .rootContext) }}
 helm.sh/chart: {{ include "nextcloud.chart" .rootContext }}
 app.kubernetes.io/managed-by: {{ .rootContext.Release.Service }}
-{{- with .rootContext.Chart.AppVersion }}
+{{- with (include "nextcloud.version" .rootContext) }}
 app.kubernetes.io/version: {{ quote . }}
 {{- end }}
 {{- end -}}