From 3a70c4c11086266e5a173fe5ad8437bd60dbc3b7 Mon Sep 17 00:00:00 2001 From: Micah Nagel Date: Mon, 10 Jun 2024 08:56:45 -0600 Subject: [PATCH 1/2] fix: svc template promtail bugfix Signed-off-by: Micah Nagel --- charts/promtail/Chart.yaml | 2 +- charts/promtail/README.md | 2 +- charts/promtail/templates/service-metrics.yaml | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/charts/promtail/Chart.yaml b/charts/promtail/Chart.yaml index 24fa5edac6..d412ab048a 100644 --- 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.0 +version: 6.16.1 home: https://grafana.com/loki sources: - https://github.com/grafana/loki diff --git a/charts/promtail/README.md b/charts/promtail/README.md index a22d448157..6ff66f4225 100644 --- a/charts/promtail/README.md +++ b/charts/promtail/README.md @@ -1,6 +1,6 @@ # promtail -![Version: 6.16.0](https://img.shields.io/badge/Version-6.16.0-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.1](https://img.shields.io/badge/Version-6.16.1-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-metrics.yaml b/charts/promtail/templates/service-metrics.yaml index 89602d6c44..18df176344 100644 --- a/charts/promtail/templates/service-metrics.yaml +++ b/charts/promtail/templates/service-metrics.yaml @@ -6,9 +6,13 @@ metadata: namespace: {{ include "promtail.namespaceName" . }} labels: {{- include "promtail.labels" . | nindent 4 }} - {{- toYaml .Values.service.labels | nindent 4 }} + {{- with .Values.service.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} annotations: - {{- toYaml .Values.service.annotations | nindent 4 }} + {{- with .Values.service.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: clusterIP: None ports: From 3ed45addcf981d39fb2f928d679b486a3927e521 Mon Sep 17 00:00:00 2001 From: Micah Nagel Date: Mon, 10 Jun 2024 09:43:03 -0600 Subject: [PATCH 2/2] fix: with placement Signed-off-by: Micah Nagel --- charts/promtail/templates/service-metrics.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/promtail/templates/service-metrics.yaml b/charts/promtail/templates/service-metrics.yaml index 18df176344..631d906910 100644 --- a/charts/promtail/templates/service-metrics.yaml +++ b/charts/promtail/templates/service-metrics.yaml @@ -9,10 +9,10 @@ metadata: {{- with .Values.service.labels }} {{- toYaml . | nindent 4 }} {{- end }} + {{- with .Values.service.annotations }} annotations: - {{- with .Values.service.annotations }} {{- toYaml . | nindent 4 }} - {{- end }} + {{- end }} spec: clusterIP: None ports: