diff --git a/charts/victoria-metrics-k8s-stack/CHANGELOG.md b/charts/victoria-metrics-k8s-stack/CHANGELOG.md index b5da74713..39162bda4 100644 --- a/charts/victoria-metrics-k8s-stack/CHANGELOG.md +++ b/charts/victoria-metrics-k8s-stack/CHANGELOG.md @@ -1,6 +1,6 @@ ## Next release -- TODO +- Fixed default image tags template. See [this issue](https://github.com/VictoriaMetrics/helm-charts/issues/1587) ## 0.27.3 diff --git a/charts/victoria-metrics-k8s-stack/Chart.yaml b/charts/victoria-metrics-k8s-stack/Chart.yaml index 13d6c8624..540b39d2f 100644 --- a/charts/victoria-metrics-k8s-stack/Chart.yaml +++ b/charts/victoria-metrics-k8s-stack/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: victoria-metrics-k8s-stack description: Kubernetes monitoring on VictoriaMetrics stack. Includes VictoriaMetrics Operator, Grafana dashboards, ServiceScrapes and VMRules type: application -version: 0.27.3 +version: 0.27.4 appVersion: v1.104.0 sources: - https://github.com/VictoriaMetrics/helm-charts diff --git a/charts/victoria-metrics-k8s-stack/templates/_helpers.tpl b/charts/victoria-metrics-k8s-stack/templates/_helpers.tpl index 9d290d9af..d0ed64eb1 100644 --- a/charts/victoria-metrics-k8s-stack/templates/_helpers.tpl +++ b/charts/victoria-metrics-k8s-stack/templates/_helpers.tpl @@ -377,9 +377,10 @@ If release name contains chart name it will be used as a full name. {{- $Values := (.helm).Values | default .Values }} {{- $Chart := (.helm).Chart | default .Chart }} {{- $spec := (include "vm.select.spec" . | fromYaml) -}} - {{- $_ := set $spec "vminsert" (dict "image" (dict "tag" (printf "%s-cluster" $Chart.AppVersion))) -}} - {{- $_ := set $spec "vmstorage" (dict "image" (dict "tag" (printf "%s-cluster" $Chart.AppVersion))) -}} {{- $clusterSpec := (deepCopy $Values.vmcluster.spec) -}} + {{- $imageSpec := (dict "image" (dict "tag" (printf "%s-cluster" $Chart.AppVersion))) -}} + {{- $clusterSpec = mergeOverwrite (dict "vminsert" (deepCopy $imageSpec)) $clusterSpec -}} + {{- $clusterSpec = mergeOverwrite (dict "vmstorage" (deepCopy $imageSpec)) $clusterSpec -}} {{- with (include "vm.license.global" .) -}} {{- $_ := set $clusterSpec "license" (fromYaml .) -}} {{- end -}}