Merge pull request #3220 from camrossi/main

[promtail] service-extra: custom labels not working
grafana · Jul 15, 2024 · 81f741b · 81f741b
2 parents e7e0553 + 722affa
commit 81f741b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/charts/promtail/Chart.yaml b/charts/promtail/Chart.yaml
@@ -3,7 +3,7 @@ name: promtail
 description: Promtail is an agent which ships the contents of local logs to a Loki instance
 type: application
 appVersion: 3.0.0
-version: 6.16.3
+version: 6.16.4
 home: https://grafana.com/loki
 sources:
   - https://github.com/grafana/loki

diff --git a/charts/promtail/README.md b/charts/promtail/README.md
@@ -1,6 +1,6 @@
 # promtail
 
-![Version: 6.16.3](https://img.shields.io/badge/Version-6.16.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
+![Version: 6.16.4](https://img.shields.io/badge/Version-6.16.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
 
 Promtail is an agent which ships the contents of local logs to a Loki instance
 

diff --git a/charts/promtail/templates/service-extra.yaml b/charts/promtail/templates/service-extra.yaml
@@ -7,8 +7,8 @@ metadata:
   namespace: {{ include "promtail.namespaceName" $ }}
   labels:
     {{- include "promtail.labels" $ | nindent 4 }}
-    {{- with .labels }}
-    {{- toYaml $ | nindent 4 }}
+    {{- with $values.labels }}
+    {{- toYaml . | nindent 4 }}
     {{- end }}
   {{- with .annotations }}
   annotations: