Merge branch 'main' of https://github.com/Sheikh-Abubaker/helm-charts …

…into promtail-bug-pr
grafana · Jun 24, 2024 · dfdc3ed · dfdc3ed
2 parents 05d4b56 + 98a0585
commit dfdc3ed
Showing 1 changed file with 6 additions and 2 deletions.
diff --git 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 }}
+  {{- with .Values.service.annotations }}
   annotations:
-    {{- toYaml .Values.service.annotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   clusterIP: None
   ports: