Use the 'pulsar.matchLabels' template for matching components of this chart. (#118)

This also limits the scope of the PodMonitors to the resources of only this install, instead of all installs that share `component:` label values.

Co-authored-by: Matthias van de Meent <matthias.vandemeent@cofano.nl>

charts/pulsar/templates/autorecovery-podmonitor.yaml

@@ -50,5 +50,6 @@ spec:
           targetLabel: kubernetes_pod_name
   selector:
     matchLabels:
+      {{- include "pulsar.matchLabels" . | nindent 6 }}
       component: {{ .Values.autorecovery.component }}
 {{- end }}

charts/pulsar/templates/autorecovery-service.yaml

@@ -32,8 +32,7 @@ spec:
     port: {{ .Values.autorecovery.ports.http }}
   clusterIP: None
   selector:
-    app: {{ template "pulsar.name" . }}
-    release: {{ .Release.Name }}
+    {{- include "pulsar.matchLabels" . | nindent 4 }}
     component: {{ .Values.autorecovery.component }}
 {{- end }}
 

charts/pulsar/templates/bookkeeper-podmonitor.yaml

@@ -50,5 +50,6 @@ spec:
           targetLabel: kubernetes_pod_name
   selector:
     matchLabels:
+      {{- include "pulsar.matchLabels" . | nindent 6 }}
       component: bookie
 {{- end }}

charts/pulsar/templates/broker-podmonitor.yaml

@@ -50,5 +50,6 @@ spec:
           targetLabel: kubernetes_pod_name
   selector:
     matchLabels:
+      {{- include "pulsar.matchLabels" . | nindent 6 }}
       component: broker
 {{- end }}

charts/pulsar/templates/broker-service.yaml

@@ -45,7 +45,6 @@ spec:
   {{- end }}
   clusterIP: None
   selector:
-    app: {{ template "pulsar.name" . }}
-    release: {{ .Release.Name }}
+    {{- include "pulsar.matchLabels" . | nindent 4 }}
     component: {{ .Values.broker.component }}
 {{- end }}

charts/pulsar/templates/dashboard-deployment.yaml

@@ -30,8 +30,7 @@ spec:
   replicas: {{ .Values.dashboard.replicaCount }}
   selector:
     matchLabels:
-      app: {{ template "pulsar.name" . }}
-      release: {{ .Release.Name }}
+      {{- include "pulsar.matchLabels" . | nindent 6 }}
       component: {{ .Values.dashboard.component }}
   template:
     metadata:

charts/pulsar/templates/dashboard-service.yaml

@@ -33,7 +33,6 @@ spec:
 {{ toYaml .Values.dashboard.service.ports | indent 2 }}
   clusterIP: None
   selector:
-    app: {{ template "pulsar.name" . }}
-    release: {{ .Release.Name }}
+    {{- include "pulsar.matchLabels" . | nindent 4 }}
     component: {{ .Values.dashboard.component }}
 {{- end }}

charts/pulsar/templates/prometheus-service.yaml

@@ -34,7 +34,6 @@ spec:
     - name: server
       port: {{ .Values.prometheus.port }}
   selector:
-    app: {{ template "pulsar.name" . }}
-    release: {{ .Release.Name }}
+    {{- include "pulsar.matchLabels" . | nindent 4 }}
     component: {{ .Values.prometheus.component }}
 {{- end }}

charts/pulsar/templates/proxy-podmonitor.yaml

@@ -50,5 +50,6 @@ spec:
           targetLabel: kubernetes_pod_name
   selector:
     matchLabels:
+      {{- include "pulsar.matchLabels" . | nindent 6 }}
       component: proxy
 {{- end }}

charts/pulsar/templates/proxy-service.yaml

@@ -50,7 +50,6 @@ spec:
       protocol: TCP
     {{- end }}
   selector:
-    app: {{ template "pulsar.name" . }}
-    release: {{ .Release.Name }}
+    {{- include "pulsar.matchLabels" . | nindent 4 }}
     component: {{ .Values.proxy.component }}
 {{- end }}

charts/pulsar/templates/pulsar-manager-service.yaml

@@ -36,8 +36,7 @@ spec:
       targetPort: {{ .Values.pulsar_manager.service.targetPort }}
       protocol: TCP
   selector:
-    app: {{ template "pulsar.name" . }}
-    release: {{ .Release.Name }}
+    {{- include "pulsar.matchLabels" . | nindent 4 }}
     component: {{ .Values.pulsar_manager.component }}
 {{- if .Values.pulsar_manager.service.loadBalancerSourceRanges }}
   loadBalancerSourceRanges:

charts/pulsar/templates/zookeeper-podmonitor.yaml

@@ -50,5 +50,6 @@ spec:
           targetLabel: kubernetes_pod_name
   selector:
     matchLabels:
+      {{- include "pulsar.matchLabels" . | nindent 6 }}
       component: zookeeper
 {{- end }}