added cluster podLabels support

VictoriaMetrics · Sep 5, 2024 · 6094016 · 6094016
1 parent 88f9498
commit 6094016
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 2 deletions.
diff --git a/charts/victoria-metrics-cluster/CHANGELOG.md b/charts/victoria-metrics-cluster/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Next release
 
 - Removed deprecated autoscaling v2beta2 API support
+- Added podLabels support
 
 ## 0.13.3
 

diff --git a/charts/victoria-metrics-cluster/Chart.yaml b/charts/victoria-metrics-cluster/Chart.yaml
@@ -3,7 +3,7 @@ type: application
 appVersion: v1.103.0
 description: Victoria Metrics Cluster version - high-performance, cost-effective and scalable TSDB, long-term remote storage for Prometheus
 name: victoria-metrics-cluster
-version: 0.13.3
+version: 0.13.4
 sources:
   - https://github.com/VictoriaMetrics/helm-charts
 icon: https://avatars.githubusercontent.com/u/43720803?s=200&v=4

diff --git a/charts/victoria-metrics-cluster/README.md b/charts/victoria-metrics-cluster/README.md
@@ -1,7 +1,7 @@
 
 # Victoria Metrics Helm Chart for Cluster Version
 
-![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.13.3](https://img.shields.io/badge/Version-0.13.3-informational?style=flat-square)
+![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.13.4](https://img.shields.io/badge/Version-0.13.4-informational?style=flat-square)
 [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/victoriametrics)](https://artifacthub.io/packages/helm/victoriametrics/victoria-metrics-cluster)
 [![Slack](https://img.shields.io/badge/join%20slack-%23victoriametrics-brightgreen.svg)](https://slack.victoriametrics.com/)
 
@@ -635,6 +635,15 @@ false
       <td><pre lang="plaintext">
 {}
 </pre>
+</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>vminsert.podLabels</td>
+      <td>object</td>
+      <td><pre lang="plaintext">
+{}
+</pre>
 </td>
       <td></td>
     </tr>
@@ -1443,6 +1452,15 @@ false
       <td><pre lang="plaintext">
 {}
 </pre>
+</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>vmselect.podLabels</td>
+      <td>object</td>
+      <td><pre lang="plaintext">
+{}
+</pre>
 </td>
       <td></td>
     </tr>
@@ -2176,6 +2194,15 @@ labels: {}
       <td><p>See <code>kubectl explain poddisruptionbudget.spec</code> for more. Details are <a href="https://kubernetes.io/docs/tasks/run-application/configure-pdb/" target="_blank">here</a></p>
 </td>
     </tr>
+    <tr>
+      <td>vmstorage.podLabels</td>
+      <td>object</td>
+      <td><pre lang="plaintext">
+{}
+</pre>
+</td>
+      <td></td>
+    </tr>
     <tr>
       <td>vmstorage.podManagementPolicy</td>
       <td>string</td>

diff --git a/charts/victoria-metrics-cluster/templates/_helpers.tpl b/charts/victoria-metrics-cluster/templates/_helpers.tpl
@@ -60,6 +60,9 @@ app.kubernetes.io/managed-by: {{ .Release.Service | trunc 63 | trimSuffix "-" }}
 
 {{- define "victoria-metrics.common.podLabels" -}}
 app.kubernetes.io/managed-by: {{ .Release.Service | trunc 63 | trimSuffix "-" }}
+{{- with .extraLabels }}
+{{ toYaml . }}
+{{- end }}
 {{- end -}}
 
 {{- define "victoria-metrics.vmstorage.labels" -}}

diff --git a/charts/victoria-metrics-cluster/templates/vminsert-deployment.yaml b/charts/victoria-metrics-cluster/templates/vminsert-deployment.yaml
@@ -25,6 +25,7 @@ spec:
       {{- with $app.podAnnotations }}
       annotations: {{ toYaml . | nindent 8 }}
       {{- end }}
+      {{- $_ := set $ctx "extraLabels" $app.podLabels }}
       labels: {{ include "victoria-metrics.vminsert.podLabels" $ctx | nindent 8 }}
     spec:
       {{- with $app.priorityClassName }}

diff --git a/charts/victoria-metrics-cluster/templates/vmselect-deployment.yaml b/charts/victoria-metrics-cluster/templates/vmselect-deployment.yaml
@@ -26,6 +26,7 @@ spec:
       {{- with $app.podAnnotations }}
       annotations: {{ toYaml . | nindent 8 }}
       {{- end }}
+      {{- $_ := set $ctx "extraLabels" $app.podLabels }}
       labels: {{ include "victoria-metrics.vmselect.podLabels" $ctx | nindent 8 }}
     spec:
       {{- with $ctx.priorityClassName }}

diff --git a/charts/victoria-metrics-cluster/templates/vmselect-statefulset.yaml b/charts/victoria-metrics-cluster/templates/vmselect-statefulset.yaml
@@ -22,6 +22,7 @@ spec:
       {{- with $app.podAnnotations }}
       annotations: {{ toYaml . | nindent 8 }}
       {{- end }}
+      {{- $_ := set $ctx "extraLabels" $app.podLabels }}
       labels: {{ include "victoria-metrics.vmselect.podLabels" $ctx | nindent 8 }}
     spec:
       {{- with $app.priorityClassName }}

diff --git a/charts/victoria-metrics-cluster/templates/vmstorage-statefulset.yaml b/charts/victoria-metrics-cluster/templates/vmstorage-statefulset.yaml
@@ -22,6 +22,7 @@ spec:
       {{- with $app.podAnnotations }}
       annotations: {{ toYaml . | nindent 8 }}
       {{- end }}
+      {{- $_ := set $ctx "extraLabels" $app.podLabels }}
       labels: {{ include "victoria-metrics.vmstorage.podLabels" $ctx | nindent 8 }}
     spec:
       {{- with $app.priorityClassName }}

diff --git a/charts/victoria-metrics-cluster/values.yaml b/charts/victoria-metrics-cluster/values.yaml
@@ -77,6 +77,7 @@ vmselect:
     loggerFormat: json
   annotations: {}
   extraLabels: {}
+  podLabels: {}
   # -- Additional environment variables (ex.: secret tokens, flags) https://docs.victoriametrics.com/#environment-variables
   env: []
   envFrom: []
@@ -325,6 +326,7 @@ vminsert:
     loggerFormat: json
   annotations: {}
   extraLabels: {}
+  podLabels: {}
   # -- Additional environment variables (ex.: secret tokens, flags) https://docs.victoriametrics.com/#environment-variables
   env: []
   envFrom: []
@@ -652,6 +654,7 @@ vmstorage:
   podAnnotations: {}
   annotations: {}
   extraLabels: {}
+  podLabels: {}
   # -- Count of vmstorage pods
   replicaCount: 2
   # -- Container workdir