common: fixed labels typo

VictoriaMetrics · Nov 21, 2024 · c855fc4 · c855fc4
1 parent 4db17b6
commit c855fc4
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 17 deletions.
diff --git a/charts/victoria-metrics-alert/templates/alertmanager-deployment.yaml b/charts/victoria-metrics-alert/templates/alertmanager-deployment.yaml
@@ -46,7 +46,7 @@ spec:
           {{- if $app.securityContext.enabled }}
           securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.securityContext "helm" .) | nindent 12 }}
           {{- end }}
-          image: {{ include "vm.image" (dict "helm" . "app" $app) }}
+          image: {{ include "vm.image" $ctx }}
           args: {{ include "alertmanager.args" $ctx | nindent 12 }}
           ports:
             - name: web

diff --git a/charts/victoria-metrics-alert/templates/server-deployment.yaml b/charts/victoria-metrics-alert/templates/server-deployment.yaml
@@ -56,7 +56,7 @@ spec:
           {{- if $app.securityContext.enabled }}
           securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.securityContext "helm" .) | nindent 12 }}
           {{- end }}
-          image: {{ include "vm.image" (dict "helm" . "app" $app) }}
+          image: {{ include "vm.image" $ctx }}
           args: {{ include "vmalert.args" $ctx | nindent 12 }}
           imagePullPolicy: {{ $app.image.pullPolicy }}
           {{- with $app.envFrom }}

diff --git a/charts/victoria-metrics-anomaly/templates/controller.yaml b/charts/victoria-metrics-anomaly/templates/controller.yaml
@@ -41,7 +41,7 @@ spec:
       {{- end }}
       containers:
         - name: model
-          image: {{ include "vm.image" (dict "helm" . "app" .Values) }}
+          image: {{ include "vm.image" $ctx }}
           workingDir: {{ .Values.containerWorkingDir }}
           {{- if (((.Values.config).monitoring).pull).enabled }}
           {{- with (((.Values.config).monitoring).pull).port }}

diff --git a/charts/victoria-metrics-cluster/templates/vmauth-deployment.yaml b/charts/victoria-metrics-cluster/templates/vmauth-deployment.yaml
@@ -45,7 +45,7 @@ spec:
       {{- end }}
       containers:
         - name: vmauth
-          image: {{ include "vm.image" (dict "helm" . "app" $app) }}
+          image: {{ include "vm.image" $ctx }}
           imagePullPolicy: {{ $app.image.pullPolicy }}
           {{- with $app.containerWorkingDir }}
           workingDir: {{ . }}

diff --git a/charts/victoria-metrics-cluster/templates/vminsert-deployment.yaml b/charts/victoria-metrics-cluster/templates/vminsert-deployment.yaml
@@ -43,7 +43,6 @@ spec:
       {{- end }}
       containers:
         - name: vminsert
-          {{- $_ := set $ctx "app" $app }}
           image: {{ include "vm.image" $ctx }}
           imagePullPolicy: {{ $app.image.pullPolicy }}
           {{- with $app.containerWorkingDir }}

diff --git a/charts/victoria-metrics-cluster/templates/vmselect-deployment.yaml b/charts/victoria-metrics-cluster/templates/vmselect-deployment.yaml
@@ -44,7 +44,7 @@ spec:
       {{- end }}
       containers:
         - name: vmselect
-          image: {{ include "vm.image" (dict "helm" . "app" $app) }}
+          image: {{ include "vm.image" $ctx }}
           imagePullPolicy: {{ $app.image.pullPolicy }}
           {{- with $app.containerWorkingDir }}
           workingDir: {{ . }}

diff --git a/charts/victoria-metrics-cluster/templates/vmselect-statefulset.yaml b/charts/victoria-metrics-cluster/templates/vmselect-statefulset.yaml
@@ -41,7 +41,7 @@ spec:
       {{- end }}
       containers:
         - name: vmselect
-          image: {{ include "vm.image" (dict "helm" . "app" $app) }}
+          image: {{ include "vm.image" $ctx }}
           imagePullPolicy: {{ $app.image.pullPolicy }}
           {{- with $app.containerWorkingDir }}
           workingDir: {{ . }}

diff --git a/charts/victoria-metrics-cluster/templates/vmstorage-statefulset.yaml b/charts/victoria-metrics-cluster/templates/vmstorage-statefulset.yaml
@@ -44,7 +44,8 @@ spec:
         {{- if $manager.restore.onStart.enabled }}
         {{- include "vm.enterprise.only" . }}
         - name: vmbackupmanager-restore
-          image: {{ include "vm.image" (dict "helm" . "app" $manager) }}
+          {{- $_ := set $ctx "appKey" (list "vmstorage" "vmbackupmanager") }}
+          image: {{ include "vm.image" $ctx }}
           imagePullPolicy: {{ $app.image.pullPolicy }}
           {{- if $app.securityContext.enabled }}
           securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.securityContext "helm" .) | nindent 12 }}
@@ -80,7 +81,8 @@ spec:
       {{- end }}
       containers:
         - name: vmstorage
-          image: {{ include "vm.image" (dict "helm" . "app" $app) }}
+          {{- $_ := set $ctx "appKey" "vmstorage" }}
+          image: {{ include "vm.image" $ctx }}
           imagePullPolicy: {{ $app.image.pullPolicy }}
           {{- with $app.containerWorkingDir }}
           workingDir: {{ . }}
@@ -159,7 +161,8 @@ spec:
         {{- if $manager.enabled }}
         {{- include "vm.enterprise.only" . }}
         - name: vmbackupmanager
-          image: {{ include "vm.image" (dict "helm" . "app" $manager) }}
+          {{- $_ := set $ctx "appKey" (list "vmstorage" "vmbackupmanager") }}
+          image: {{ include "vm.image" $ctx }}
           imagePullPolicy: {{ $app.image.pullPolicy }}
           {{- if $app.securityContext.enabled }}
           securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.securityContext "helm" .) | nindent 12 }}

diff --git a/charts/victoria-metrics-common/CHANGELOG.md b/charts/victoria-metrics-common/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Next release
 
-- TODO
+- fixed minor typo in vm.labels
 
 ## 0.0.30
 

diff --git a/charts/victoria-metrics-common/Chart.yaml b/charts/victoria-metrics-common/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 type: library
 description: Victoria Metrics Common - contains shared templates for all Victoria Metrics helm charts
 name: victoria-metrics-common
-version: 0.0.30
+version: 0.0.31
 sources:
   - https://github.com/VictoriaMetrics/helm-charts
 kubeVersion: ">=1.23.0-0"

diff --git a/charts/victoria-metrics-common/templates/_helpers.tpl b/charts/victoria-metrics-common/templates/_helpers.tpl
@@ -195,9 +195,8 @@ If release name contains chart name it will be used as a full name.
   {{- include "vm.validate.args" . -}}
   {{- $labels := fromYaml (include "vm.selectorLabels" .) -}}
   {{- $labels = mergeOverwrite $labels (fromYaml (include "vm.metaLabels" .)) -}}
-  {{- $tag := include "vm.image.tag" . -}}
-  {{- if .app }}
-    {{- $_ := set $labels "app.kubernetes.io/version" $tag -}}
+  {{- with (include "vm.image.tag" .) }}
+    {{- $_ := set $labels "app.kubernetes.io/version" . -}}
   {{- end -}}
   {{- toYaml $labels -}}
 {{- end -}}

diff --git a/charts/victoria-metrics-operator/templates/cleanup.yaml b/charts/victoria-metrics-operator/templates/cleanup.yaml
@@ -29,7 +29,8 @@ spec:
       {{- end }}
       containers:
         - name: kubectl
-          image: {{ include "vm.image" (dict "helm" . "app" $app) }}
+          {{- $_ := set $ctx "appKey" (list "crds" "cleanup") }}
+          image: {{ include "vm.image" $ctx }}
           imagePullPolicy: {{ $app.image.pullPolicy }}
           resources: {{ toYaml $app.resources | nindent 12 }}
           args:

diff --git a/charts/victoria-metrics-operator/templates/deployment.yaml b/charts/victoria-metrics-operator/templates/deployment.yaml
@@ -37,7 +37,7 @@ spec:
       {{- end }}
       containers:
         - name: operator
-          image: {{ include "vm.image" (dict "helm" . "app" .Values ) }}
+          image: {{ include "vm.image" $ctx }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           {{- with .Values.envFrom }}
           envFrom: {{ toYaml . | nindent 12 }}