k8s-stack: release 0.38.1

VictoriaMetrics · Mar 2, 2025 · d893853 · d893853
1 parent 5b62135
commit d893853
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/charts/victoria-metrics-k8s-stack/CHANGELOG.md b/charts/victoria-metrics-k8s-stack/CHANGELOG.md
@@ -1,6 +1,9 @@
 ## Next release
 
 - Upgraded dashboard and rules
+- Use enterprise images for VM components if license is set. See [this issue](https://github.com/VictoriaMetrics/helm-charts/issues/2023).
+- updated common dependency 0.0.39 -> 0.0.41
+
 
 ## 0.38.0
 

diff --git a/charts/victoria-metrics-k8s-stack/Chart.lock b/charts/victoria-metrics-k8s-stack/Chart.lock
@@ -1,21 +1,21 @@
 dependencies:
 - name: victoria-metrics-common
   repository: https://victoriametrics.github.io/helm-charts
-  version: 0.0.39
+  version: 0.0.41
 - name: victoria-metrics-operator
   repository: https://victoriametrics.github.io/helm-charts
-  version: 0.42.0
+  version: 0.42.3
 - name: kube-state-metrics
   repository: https://prometheus-community.github.io/helm-charts
   version: 5.29.0
 - name: prometheus-node-exporter
   repository: https://prometheus-community.github.io/helm-charts
-  version: 4.44.0
+  version: 4.44.1
 - name: grafana
   repository: https://grafana.github.io/helm-charts
   version: 8.9.1
 - name: prometheus-operator-crds
   repository: https://prometheus-community.github.io/helm-charts
   version: 17.0.2
-digest: sha256:12cc953fb963147ec495aad74cc5d33668fa137d72992d70d240dfa9a40f8661
-generated: "2025-02-19T19:08:24.940994747+07:00"
+digest: sha256:e925bd2afb1852ee2515ac29627794e5bc9ac8df9ecc5075a4eca2431e4d1760
+generated: "2025-03-02T17:39:21.604568+02:00"
diff --git 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.38.0
+version: 0.38.1
 appVersion: v1.112.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
@@ -109,6 +109,7 @@
 {{- define "vm.alert.spec" -}}
   {{- $Values := (.helm).Values | default .Values }}
   {{- $Chart := (.helm).Chart | default .Chart }}
+  {{- $image := dict "tag" (include "vm.image.tag" .) }}
   {{- $extraArgs := dict "remoteWrite.disablePathAppend" "true" -}}
   {{- $fullname := include "vm.managed.fullname" . }}
   {{- if $Values.vmalert.templateFiles -}}
@@ -117,7 +118,7 @@
   {{- end -}}
   {{- $vmAlertTemplates := include "vm.alert.templates" . | fromYaml -}}
   {{- $vmAlertRemotes := include "vm.alert.remotes" . | fromYaml -}}
-  {{- $spec := dict "extraArgs" $extraArgs "image" (dict "tag" $Chart.AppVersion) -}}
+  {{- $spec := dict "extraArgs" $extraArgs "image" $image -}}
   {{- with (include "vm.license.global" .) -}}
     {{- $_ := set $spec "license" (fromYaml .) -}}
   {{- end -}}
@@ -149,13 +150,15 @@
   {{- with (include "vm.license.global" .) -}}
     {{- $_ := set $spec "license" (fromYaml .) -}}
   {{- end -}}
-  {{- $_ := set $spec "image" (dict "tag" $Chart.AppVersion) -}}
+  {{- $image := dict "tag" (include "vm.image.tag" .) }}
+  {{- $_ := set $spec "image" $image -}}
   {{- tpl (deepCopy $Values.vmagent.spec | mergeOverwrite $spec | toYaml) . -}}
 {{- end }}
 
 {{- /* VMAuth spec */ -}}
 {{- define "vm.auth.spec" -}}
   {{- $Values := (.helm).Values | default .Values }}
+  {{- $image := dict "tag" (include "vm.image.tag" .) }}
   {{- $_ := set . "style" "managed" -}}
   {{- if $Values.vmsingle.enabled -}}
     {{- $_ := set . "appKey" (list "vmsingle" "spec") -}}
@@ -179,6 +182,7 @@
     {{- end -}}
   {{- end -}}
   {{- $spec := $Values.vmauth.spec }}
+  {{- $_ := set $spec "image" $image -}}
   {{- with (include "vm.license.global" .) -}}
     {{- $_ := set $spec "license" (fromYaml .) -}}
   {{- end -}}
@@ -220,7 +224,8 @@
     {{- $_ := set . "appKey" (list "vmalert" "spec") }}
     {{- $_ := set $extraArgs "vmalert.proxyURL" (include "vm.url" .) -}}
   {{- end -}}
-  {{- $spec := dict "extraArgs" $extraArgs "image" (dict "tag" $Chart.AppVersion) -}}
+  {{- $image := dict "tag" (include "vm.image.tag" .) }}
+  {{- $spec := dict "extraArgs" $extraArgs "image" $image -}}
   {{- with (include "vm.license.global" .) -}}
     {{- $_ := set $spec "license" (fromYaml .) -}}
   {{- end -}}
@@ -237,7 +242,8 @@
     {{- $_ := set . "appKey" (list "vmalert" "spec") -}}
     {{- $_ := set $extraArgs "vmalert.proxyURL" (include "vm.url" .) -}}
   {{- end -}}
-  {{- $spec := dict "extraArgs" $extraArgs "image" (dict "tag" (printf "%s-cluster" $Chart.AppVersion)) -}}
+  {{- $image := dict "tag" (printf "%s-cluster" (include "vm.image.tag" .)) }}
+  {{- $spec := dict "extraArgs" $extraArgs "image" $image -}}
   {{- toYaml $spec -}}
 {{- end -}}
 
@@ -246,9 +252,9 @@
   {{- $Chart := (.helm).Chart | default .Chart }}
   {{- $spec := include "vm.select.spec" . | fromYaml -}}
   {{- $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 -}}
+  {{- $image := dict "tag" (printf "%s-cluster" (include "vm.image.tag" .)) }}
+  {{- $clusterSpec = mergeOverwrite (dict "vminsert" (deepCopy $image)) $clusterSpec -}}
+  {{- $clusterSpec = mergeOverwrite (dict "vmstorage" (deepCopy $image)) $clusterSpec -}}
   {{- with (include "vm.license.global" .) -}}
     {{- $_ := set $clusterSpec "license" (fromYaml .) -}}
   {{- end -}}