You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2022/10/21 02:15:20 UTC
[pulsar-helm-chart] branch master updated: Fix PodMonitor name conflicts for multiple releases in same namespace (#258)
This is an automated email from the ASF dual-hosted git repository.
mmarshall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar-helm-chart.git
The following commit(s) were added to refs/heads/master by this push:
new 95c218b Fix PodMonitor name conflicts for multiple releases in same namespace (#258)
95c218b is described below
commit 95c218b218ab4ca0c96dc75e6d3badc3f6e6a29a
Author: edward.zeng <ji...@zilliz.com>
AuthorDate: Fri Oct 21 10:15:16 2022 +0800
Fix PodMonitor name conflicts for multiple releases in same namespace (#258)
* Fix PodMonitor name conflicts for multiple releases in same namespace
Signed-off-by: Edward Zeng <ji...@zilliz.com>
* Use pulsar.fullname for PodMonitor name prefix
Signed-off-by: Edward Zeng <ji...@zilliz.com>
Co-authored-by: Michael Marshall <mm...@apache.org>
Signed-off-by: Edward Zeng <ji...@zilliz.com>
Fixes #257
### Motivation
Fix PodMonitor name conflicts for multiple releases in same namespace
### Modifications
Use release name instead of hardcode `pulsar.name` for pod monitor name.
### Verifying this change
- [x] Make sure that the change passes the CI checks.
---
charts/pulsar/templates/bookkeeper-podmonitor.yaml | 4 ++--
charts/pulsar/templates/broker-podmonitor.yaml | 4 ++--
charts/pulsar/templates/proxy-podmonitor.yaml | 4 ++--
charts/pulsar/templates/zookeeper-podmonitor.yaml | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/charts/pulsar/templates/bookkeeper-podmonitor.yaml b/charts/pulsar/templates/bookkeeper-podmonitor.yaml
index c30ab1d..a85441b 100644
--- a/charts/pulsar/templates/bookkeeper-podmonitor.yaml
+++ b/charts/pulsar/templates/bookkeeper-podmonitor.yaml
@@ -22,7 +22,7 @@
apiVersion: monitoring.coreos.com/v1
kind: PodMonitor
metadata:
- name: {{ template "pulsar.name" . }}-bookie
+ name: {{ template "pulsar.fullname" . }}-bookie
labels:
app: {{ template "pulsar.name" . }}
chart: {{ template "pulsar.chart" . }}
@@ -52,4 +52,4 @@ spec:
matchLabels:
{{- include "pulsar.matchLabels" . | nindent 6 }}
component: bookie
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/pulsar/templates/broker-podmonitor.yaml b/charts/pulsar/templates/broker-podmonitor.yaml
index e2b6b8f..9ea0c4c 100644
--- a/charts/pulsar/templates/broker-podmonitor.yaml
+++ b/charts/pulsar/templates/broker-podmonitor.yaml
@@ -22,7 +22,7 @@
apiVersion: monitoring.coreos.com/v1
kind: PodMonitor
metadata:
- name: {{ template "pulsar.name" . }}-broker
+ name: {{ template "pulsar.fullname" . }}-broker
labels:
app: {{ template "pulsar.name" . }}
chart: {{ template "pulsar.chart" . }}
@@ -52,4 +52,4 @@ spec:
matchLabels:
{{- include "pulsar.matchLabels" . | nindent 6 }}
component: broker
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/pulsar/templates/proxy-podmonitor.yaml b/charts/pulsar/templates/proxy-podmonitor.yaml
index 7f61522..66020dc 100644
--- a/charts/pulsar/templates/proxy-podmonitor.yaml
+++ b/charts/pulsar/templates/proxy-podmonitor.yaml
@@ -22,7 +22,7 @@
apiVersion: monitoring.coreos.com/v1
kind: PodMonitor
metadata:
- name: {{ template "pulsar.name" . }}-proxy
+ name: {{ template "pulsar.fullname" . }}-proxy
labels:
app: {{ template "pulsar.name" . }}
chart: {{ template "pulsar.chart" . }}
@@ -52,4 +52,4 @@ spec:
matchLabels:
{{- include "pulsar.matchLabels" . | nindent 6 }}
component: proxy
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/pulsar/templates/zookeeper-podmonitor.yaml b/charts/pulsar/templates/zookeeper-podmonitor.yaml
index dda06d9..8da13eb 100644
--- a/charts/pulsar/templates/zookeeper-podmonitor.yaml
+++ b/charts/pulsar/templates/zookeeper-podmonitor.yaml
@@ -22,7 +22,7 @@
apiVersion: monitoring.coreos.com/v1
kind: PodMonitor
metadata:
- name: {{ template "pulsar.name" . }}-zookeeper
+ name: {{ template "pulsar.fullname" . }}-zookeeper
labels:
app: {{ template "pulsar.name" . }}
chart: {{ template "pulsar.chart" . }}
@@ -52,4 +52,4 @@ spec:
matchLabels:
{{- include "pulsar.matchLabels" . | nindent 6 }}
component: zookeeper
-{{- end }}
\ No newline at end of file
+{{- end }}