Merge branch 'main' into better-nodeselector

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 - Added `nodeSelector` fields for every resource type for better fine-grain tuning of where resources end up.
 
+# 6.0.2
+
+- Helm version tagging now utilizes `.Values.image.tag` when set.
+
 # 6.0.1
 
 - Added additional values to separate out `db:prepare` and `db:migrate` jobs and whether they should run:

templates/_helpers.tpl

@@ -47,7 +47,9 @@ Common labels
 helm.sh/chart: {{ include "mastodon.chart" . }}
 {{ include "mastodon.selectorLabels" . }}
 {{ include "mastodon.globalLabels" . }}
-{{- if .Chart.AppVersion }}
+{{- if .Values.image.tag }}
+app.kubernetes.io/version: {{ .Values.image.tag | quote }}
+{{- else if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}