Add render condition for servicemonitor and podmonitor (#141)

* Update podmonitor.yaml * Update podmonitor.yaml
hypertrace · Oct 9, 2024 · d6e6668 · d6e6668
1 parent ac09307
commit d6e6668
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/helm/templates/hypertrace-collector/podmonitor.yaml b/helm/templates/hypertrace-collector/podmonitor.yaml
@@ -1,4 +1,5 @@
-{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) ( .Values.podmonitor.enabled ) }}
+{{- if .Values.podmonitor.enabled }}
+{{- if  .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
@@ -39,3 +40,4 @@ spec:
     matchNames:
       - {{ .Release.Namespace }}
 {{- end }}
+{{- end }}
diff --git a/helm/templates/hypertrace-metrics-collector/podmonitor.yaml b/helm/templates/hypertrace-metrics-collector/podmonitor.yaml
@@ -1,4 +1,5 @@
-{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) ( .Values.metrics.enabled ) ( .Values.metrics.podmonitor.enabled ) }}
+{{- if and ( .Values.metrics.enabled ) ( .Values.metrics.podmonitor.enabled ) }}
+{{- if .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
@@ -39,3 +40,4 @@ spec:
     matchNames:
       - {{ .Release.Namespace }}
 {{- end }}
+{{- end }}