Merge pull request #72 from jouve/distribution

fix servicemonitor labels
jouve · Mar 2, 2025 · ab2808b · ab2808b
2 parents 1c023e0 + 9592c67
commit ab2808b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/charts/distribution/Chart.lock b/charts/distribution/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.28.0
-digest: sha256:fe5563f5dfd33fdbf089e17d991dae7cc060a9b10f226d28e84c38a6d449a6d8
-generated: "2024-12-19T18:25:07.469674959+01:00"
+  version: 2.30.0
+digest: sha256:f63bb86d3a35323ac90b77ba184e6a10e8ef9b4dca1bc058452e79cfb3afd309
+generated: "2025-03-02T19:40:45.446406712+01:00"
diff --git a/charts/distribution/Chart.yaml b/charts/distribution/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: distribution
 description: A Helm chart for Kubernetes
 type: application
-version: 0.1.6
+version: 0.1.7
 appVersion: 2.8.3
 dependencies:
 - name: common

diff --git a/charts/distribution/templates/servicemonitor.yaml b/charts/distribution/templates/servicemonitor.yaml
@@ -4,7 +4,7 @@ kind: ServiceMonitor
 metadata:
   name: {{ template "common.names.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.tplvalues.merge" (dict "values" .Values.metrics.serviceMonitor.labels .Values.commonLabels "context" .) | nindent 4 }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" (include "common.tplvalues.merge" (dict "values" (list .Values.metrics.serviceMonitor.labels .Values.commonLabels) "context" $) | fromYaml) "context" $ ) | nindent 4 }}
   {{- with include "common.tplvalues.merge" (dict "values" (list .Values.metrics.serviceMonitor.annotations .Values.commonAnnotations) "context" .) | fromYaml }}
   annotations: {{- . | toYaml | nindent 4 }}
   {{- end }}