diff --git a/charts/pulsar/templates/_certs.tpl b/charts/pulsar/templates/_certs.tpl index 8c5d93a..215792f 100644 --- a/charts/pulsar/templates/_certs.tpl +++ b/charts/pulsar/templates/_certs.tpl @@ -72,6 +72,8 @@ kind: Certificate metadata: name: "{{ template "pulsar.fullname" .root }}-{{ .tlsConfig.cert_name }}" namespace: {{ template "pulsar.namespace" .root }} + labels: + {{- include "pulsar.standardLabels" .root | nindent 4 }} spec: # Secret names are always required. secretName: "{{ .root.Release.Name }}-{{ .tlsConfig.cert_name }}" diff --git a/charts/pulsar/templates/_monitor.tpl b/charts/pulsar/templates/_monitor.tpl index b7d4904..b93aaed 100644 --- a/charts/pulsar/templates/_monitor.tpl +++ b/charts/pulsar/templates/_monitor.tpl @@ -43,10 +43,7 @@ kind: PodMonitor metadata: name: {{ template "pulsar.fullname" $root }}-{{ replace "." "-" $component }} labels: - app: {{ template "pulsar.name" $root }} - chart: {{ template "pulsar.chart" $root }} - release: {{ $root.Release.Name }} - heritage: {{ $root.Release.Service }} + {{- include "pulsar.standardLabels" $root | nindent 4 }} spec: jobLabel: {{ replace "." "-" $component }} podMetricsEndpoints: diff --git a/charts/pulsar/templates/bookkeeper-cluster-initialize.yaml b/charts/pulsar/templates/bookkeeper-cluster-initialize.yaml index 1f87efd..fab46ab 100755 --- a/charts/pulsar/templates/bookkeeper-cluster-initialize.yaml +++ b/charts/pulsar/templates/bookkeeper-cluster-initialize.yaml @@ -33,6 +33,10 @@ spec: ttlSecondsAfterFinished: {{ .Values.job.ttl.secondsAfterFinished | default 600 }} {{- end }} template: + metadata: + labels: + {{- include "pulsar.template.labels" . | nindent 8 }} + component: {{ .Values.bookkeeper.component }}-init spec: {{- include "pulsar.imagePullSecrets" . | nindent 6 }} serviceAccountName: "{{ template "pulsar.fullname" . }}-{{ .Values.bookkeeper.component }}" diff --git a/charts/pulsar/templates/proxy-hpa.yaml b/charts/pulsar/templates/proxy-hpa.yaml index 291c072..b190560 100644 --- a/charts/pulsar/templates/proxy-hpa.yaml +++ b/charts/pulsar/templates/proxy-hpa.yaml @@ -27,6 +27,8 @@ kind: HorizontalPodAutoscaler metadata: name: "{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}" namespace: {{ template "pulsar.namespace" . }} + labels: + {{- include "pulsar.standardLabels" . | nindent 4 }} spec: maxReplicas: {{ .Values.proxy.autoscaling.maxReplicas }} {{- with .Values.proxy.autoscaling.metrics }} diff --git a/charts/pulsar/templates/pulsar-cluster-initialize.yaml b/charts/pulsar/templates/pulsar-cluster-initialize.yaml index dfe577c..1279486 100755 --- a/charts/pulsar/templates/pulsar-cluster-initialize.yaml +++ b/charts/pulsar/templates/pulsar-cluster-initialize.yaml @@ -34,6 +34,10 @@ spec: ttlSecondsAfterFinished: {{ .Values.job.ttl.secondsAfterFinished | default 600 }} {{- end }} template: + metadata: + labels: + {{- include "pulsar.template.labels" . | nindent 8 }} + component: {{ .Values.pulsar_metadata.component }} spec: {{- include "pulsar.imagePullSecrets" . | nindent 6 }} {{- if .Values.pulsar_metadata.nodeSelector }} diff --git a/charts/pulsar/templates/pulsar-manager-admin-secret.yaml b/charts/pulsar/templates/pulsar-manager-admin-secret.yaml index fbee9b2..4c88352 100755 --- a/charts/pulsar/templates/pulsar-manager-admin-secret.yaml +++ b/charts/pulsar/templates/pulsar-manager-admin-secret.yaml @@ -24,12 +24,8 @@ metadata: name: "{{ template "pulsar.fullname" . }}-{{ .Values.pulsar_manager.component }}-secret" namespace: {{ template "pulsar.namespace" . }} labels: - app: {{ template "pulsar.name" . }} - chart: {{ template "pulsar.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + {{- include "pulsar.standardLabels" . | nindent 4 }} component: {{ .Values.pulsar_manager.component }} - cluster: {{ template "pulsar.fullname" . }} "helm.sh/resource-policy": "keep" # do not remove when uninstalling to keep it for next install type: Opaque data: diff --git a/charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml b/charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml index e0f2b6a..c1ce662 100755 --- a/charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml +++ b/charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml @@ -32,6 +32,10 @@ spec: ttlSecondsAfterFinished: {{ .Values.job.ttl.secondsAfterFinished | default 600 }} {{- end }} template: + metadata: + labels: + {{- include "pulsar.template.labels" . | nindent 8 }} + component: {{ .Values.pulsar_manager.component }}-init spec: {{- include "pulsar.imagePullSecrets" . | nindent 6 }} nodeSelector: diff --git a/charts/pulsar/templates/tls-cert-internal-issuer.yaml b/charts/pulsar/templates/tls-cert-internal-issuer.yaml index b67a480..f2ede04 100644 --- a/charts/pulsar/templates/tls-cert-internal-issuer.yaml +++ b/charts/pulsar/templates/tls-cert-internal-issuer.yaml @@ -24,6 +24,8 @@ kind: Issuer metadata: name: "{{ template "pulsar.fullname" . }}-{{ .Values.certs.internal_issuer.component }}" namespace: {{ template "pulsar.namespace" . }} + labels: + {{- include "pulsar.standardLabels" . | nindent 4 }} spec: selfSigned: {} --- @@ -32,6 +34,8 @@ kind: Certificate metadata: name: "{{ template "pulsar.fullname" . }}-ca" namespace: {{ template "pulsar.namespace" . }} + labels: + {{- include "pulsar.standardLabels" . | nindent 4 }} spec: secretName: "{{ template "pulsar.certs.issuers.ca.secretName" . }}" commonName: "{{ template "pulsar.namespace" . }}.svc.{{ .Values.clusterDomain }}" @@ -56,6 +60,8 @@ kind: Issuer metadata: name: "{{ template "pulsar.certs.issuers.ca.name" . }}" namespace: {{ template "pulsar.namespace" . }} + labels: + {{- include "pulsar.standardLabels" . | nindent 4 }} spec: ca: secretName: "{{ template "pulsar.certs.issuers.ca.secretName" . }}"