Revert "only deploy podmonitors when prometheus is enabled"

This reverts commit e603c07.
apache · Jan 21, 2024 · fd9be9d · fd9be9d
1 parent 8e4560a
commit fd9be9d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/charts/pulsar/templates/autorecovery/autorecovery-podmonitor.yaml b/charts/pulsar/templates/autorecovery/autorecovery-podmonitor.yaml
@@ -18,8 +18,7 @@
 #
 
 # deploy broker PodMonitor only when `$.Values.broker.podMonitor.enabled` is true
-# index? see: https://github.com/helm/helm/issues/2192#issuecomment-293739257
-{{- if and .Values.autorecovery.podMonitor.enabled (index .Values "kube-prometheus-stack").enabled }}
+{{- if $.Values.autorecovery.podMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:

diff --git a/charts/pulsar/templates/bookkeeper/bookkeeper-podmonitor.yaml b/charts/pulsar/templates/bookkeeper/bookkeeper-podmonitor.yaml
@@ -18,8 +18,7 @@
 #
 
 # deploy bookkeeper PodMonitor only when `$.Values.bookkeeper.podMonitor.enabled` is true
-# index? see: https://github.com/helm/helm/issues/2192#issuecomment-293739257
-{{- if and .Values.bookkeeper.podMonitor.enabled (index .Values "kube-prometheus-stack").enabled }}
+{{- if $.Values.bookkeeper.podMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:

diff --git a/charts/pulsar/templates/broker/broker-podmonitor.yaml b/charts/pulsar/templates/broker/broker-podmonitor.yaml
@@ -18,8 +18,7 @@
 #
 
 # deploy broker PodMonitor only when `$.Values.broker.podMonitor.enabled` is true
-# index? see: https://github.com/helm/helm/issues/2192#issuecomment-293739257
-{{- if and .Values.broker.podMonitor.enabled (index .Values "kube-prometheus-stack").enabled }}
+{{- if $.Values.broker.podMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:

diff --git a/charts/pulsar/templates/proxy/proxy-podmonitor.yaml b/charts/pulsar/templates/proxy/proxy-podmonitor.yaml
@@ -18,8 +18,7 @@
 #
 
 # deploy proxy PodMonitor only when `$.Values.proxy.podMonitor.enabled` is true
-# index? see: https://github.com/helm/helm/issues/2192#issuecomment-293739257
-{{- if and .Values.proxy.podMonitor.enabled (index .Values "kube-prometheus-stack").enabled }}
+{{- if $.Values.proxy.podMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:

diff --git a/charts/pulsar/templates/zookeeper/zookeeper-podmonitor.yaml b/charts/pulsar/templates/zookeeper/zookeeper-podmonitor.yaml
@@ -18,8 +18,7 @@
 #
 
 # deploy zookeeper PodMonitor only when `$.Values.zookeeper.podMonitor.enabled` is true
-# index? see: https://github.com/helm/helm/issues/2192#issuecomment-293739257
-{{- if and .Values.zookeeper.podMonitor.enabled (index .Values "kube-prometheus-stack").enabled}}
+{{- if $.Values.zookeeper.podMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata: