Skip to content

Commit 3b47d41

Browse files
committed
fix(helm): separate podMonitor toggle, quote interval values
1 parent c924e0d commit 3b47d41

4 files changed

Lines changed: 7 additions & 4 deletions

File tree

charts/imp/templates/agent/podmonitor.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.metrics.serviceMonitor.enabled }}
1+
{{- if .Values.metrics.podMonitor.enabled }}
22
apiVersion: monitoring.coreos.com/v1
33
kind: PodMonitor
44
metadata:
@@ -14,7 +14,7 @@ spec:
1414
app.kubernetes.io/component: agent
1515
podMetricsEndpoints:
1616
- port: metrics
17-
interval: {{ .Values.metrics.serviceMonitor.interval }}
17+
interval: {{ .Values.metrics.podMonitor.interval | quote }}
1818
namespaceSelector:
1919
matchNames:
2020
- {{ .Release.Namespace }}

charts/imp/templates/operator/servicemonitor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
app.kubernetes.io/component: operator
1515
endpoints:
1616
- port: metrics
17-
interval: {{ .Values.metrics.serviceMonitor.interval }}
17+
interval: {{ .Values.metrics.serviceMonitor.interval | quote }}
1818
namespaceSelector:
1919
matchNames:
2020
- {{ .Release.Namespace }}

charts/imp/tests/metrics_test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ tests:
3232
- it: skips PodMonitor when disabled
3333
template: templates/agent/podmonitor.yaml
3434
set:
35-
metrics.serviceMonitor.enabled: false
35+
metrics.podMonitor.enabled: false
3636
asserts:
3737
- hasDocuments:
3838
count: 0

charts/imp/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,6 @@ metrics:
5656
serviceMonitor:
5757
enabled: true
5858
interval: 30s
59+
podMonitor:
60+
enabled: true
61+
interval: 30s

0 commit comments

Comments
 (0)