Fixed prometheus annotations

This commit is contained in:
2023-11-02 00:21:17 +01:00
parent 3c27c54bbf
commit 9c9ec92b74
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -2,7 +2,7 @@ apiVersion: v2
name: template name: template
description: A Helm library chart containing common templates, keeping application templates short description: A Helm library chart containing common templates, keeping application templates short
type: library type: library
version: 0.1.18 version: 0.1.19
maintainers: maintainers:
- name: Jim Martens - name: Jim Martens
url: https://2martens.de url: https://2martens.de
@@ -11,7 +11,7 @@ sources:
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- kind: fixed - kind: fixed
description: Fixed location of annotations for prometheus description: Fixed annotations
artifacthub.io/signKey: | artifacthub.io/signKey: |
fingerprint: F0F153B65BAD467201D7544E47393ABD1F96B7C8 fingerprint: F0F153B65BAD467201D7544E47393ABD1F96B7C8
url: https://mafiasi.de/pks/key/47393ABD1F96B7C8.asc url: https://mafiasi.de/pks/key/47393ABD1F96B7C8.asc
+2 -2
View File
@@ -15,7 +15,6 @@ spec:
{{- include "template.selectorLabels" . | nindent 6 }} {{- include "template.selectorLabels" . | nindent 6 }}
template: template:
metadata: metadata:
{{- with .Values.podAnnotations }}
annotations: annotations:
{{- if $.Values.prometheus.enabled }} {{- if $.Values.prometheus.enabled }}
prometheus.io/scrape: "true" prometheus.io/scrape: "true"
@@ -26,8 +25,9 @@ spec:
{{- end }} {{- end }}
prometheus.io/port: "{{ $.Values.application.actuatorPort }}" prometheus.io/port: "{{ $.Values.application.actuatorPort }}"
{{- end }} {{- end }}
{{- with .Values.podAnnotations }}
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
labels: labels:
{{- include "template.selectorLabels" . | nindent 8 }} {{- include "template.selectorLabels" . | nindent 8 }}
spec: spec: