Merge monitoring labels from global values (#1267)

Signed-off-by: Tamal Saha <[email protected]>
kubedb · Sep 1, 2024 · 53b2b7d · 53b2b7d
1 parent 0b3403a
commit 53b2b7d
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/charts/kubedb/templates/_helpers.tpl b/charts/kubedb/templates/_helpers.tpl
@@ -173,11 +173,7 @@ Returns whether the ServiceMonitor will be labeled with custom label
 Returns the ServiceMonitor labels
 */}}
 {{- define "monitoring.servicemonitor-label" -}}
-{{- range $key, $val := .Values.monitoring.serviceMonitor.labels }}
+{{- range $key, $val := mergeOverwrite dict .Values.monitoring.serviceMonitor.labels .Values.global.monitoring.serviceMonitor.labels }}
 {{ $key }}: {{ $val }}
-{{- else }}
-{{- range $key, $val := .Values.global.monitoring.serviceMonitor.labels }}
-{{ $key }}: {{ $val }}
-{{- end }}
 {{- end }}
 {{- end }}