Skip to content

Remove log volume, use operator logConfig #1218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove log volume, use operator logConfig #1218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
018e172
rm log volume
labuladong May 13, 2025
53f3bf5
rm proxy
labuladong May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions charts/sn-platform-slim/templates/bookkeeper/_bookkeeper.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,24 +144,6 @@ done;
{{- end }}
{{- end }}

{{/*
Define bookkeeper log mounts
*/}}
{{- define "pulsar.bookkeeper.log.volumeMounts" -}}
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.bookkeeper.component }}-log4j2"
mountPath: "{{ template "pulsar.home" .}}/conf/log4j2.yaml"
subPath: log4j2.yaml
{{- end }}

{{/*
Define bookkeeper log volumes
*/}}
{{- define "pulsar.bookkeeper.log.volumes" -}}
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.bookkeeper.component }}-log4j2"
configMap:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.bookkeeper.component }}"
{{- end }}

{{/*Define bookkeeper pod name*/}}
{{- define "pulsar.bookkeeper.podName" -}}
{{- print "bookie" -}}
Expand Down
2 changes: 0 additions & 2 deletions charts/sn-platform-slim/templates/bookkeeper/bookkeeper-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ spec:
emptyDir: {}
{{- end }}
{{- include "pulsar.bookkeeper.certs.volumes" . | nindent 4 }}
{{- include "pulsar.bookkeeper.log.volumes" . | nindent 4 }}
{{- end }}
{{- if and (not .Values.bookkeeper.operator.adopt_existing) .Values.tls.bookie.enabled }}
volumes:
Expand Down Expand Up @@ -291,7 +290,6 @@ spec:
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.bookkeeper.component }}-{{ .Values.bookkeeper.volumes.ledgers.name }}"
mountPath: /pulsar/data/bookkeeper/ledgers
{{- include "pulsar.bookkeeper.certs.volumeMounts" . | nindent 6 }}
{{- include "pulsar.bookkeeper.log.volumeMounts" . | nindent 6 }}
{{- end }}
{{- if and (not .Values.bookkeeper.operator.adopt_existing) .Values.tls.bookie.enabled }}
volumeMounts:
Expand Down
18 changes: 0 additions & 18 deletions charts/sn-platform-slim/templates/broker/_broker.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,24 +124,6 @@ Define broker tls certs volumes
{{- end }}
{{- end }}

{{/*
Define broker log mounts
*/}}
{{- define "pulsar.broker.log.volumeMounts" -}}
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}-log4j2"
mountPath: "{{ template "pulsar.home" .}}/conf/log4j2.yaml"
subPath: log4j2.yaml
{{- end }}

{{/*
Define broker log volumes
*/}}
{{- define "pulsar.broker.log.volumes" -}}
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}-log4j2"
configMap:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}"
{{- end }}

{{/*
Define function worker config volume mount
*/}}
Expand Down
17 changes: 0 additions & 17 deletions charts/sn-platform-slim/templates/proxy/_proxy.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,23 +77,6 @@ Define proxy certs volumes
{{- end }}
{{- end }}

{{/*
Define proxy log mounts
*/}}
{{- define "pulsar.proxy.log.volumeMounts" -}}
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}-log4j2"
mountPath: "{{ template "pulsar.home" . }}/conf/log4j2.yaml"
subPath: log4j2.yaml
{{- end }}

{{/*
Define proxy log volumes
*/}}
{{- define "pulsar.proxy.log.volumes" -}}
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}-log4j2"
configMap:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}"
{{- end }}

{{/*Define proxy pod name*/}}
{{- define "pulsar.proxy.containerName" -}}
Expand Down
19 changes: 0 additions & 19 deletions charts/sn-platform-slim/templates/zookeeper/_zookeeper.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,25 +92,6 @@ Define zookeeper certs volumes
{{- end}}
{{- end }}


{{/*
Define zookeeper log mounts
*/}}
{{- define "pulsar.zookeeper.log.volumeMounts" -}}
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.zookeeper.component }}-log4j2"
mountPath: "{{ template "pulsar.home" . }}/conf/log4j2.yaml"
subPath: log4j2.yaml
{{- end }}

{{/*
Define zookeeper log volumes
*/}}
{{- define "pulsar.zookeeper.log.volumes" -}}
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.zookeeper.component }}-log4j2"
configMap:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.zookeeper.component }}"
{{- end }}

{{/*Define zookeeper pod name*/}}
{{- define "pulsar.zookeeper.podName" -}}
{{- print "zookeeper" -}}
Expand Down
3 changes: 0 additions & 3 deletions charts/sn-platform-slim/templates/zookeeper/zookeeper-backup-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ spec:
bin/pulsar-metadata-tool backup
volumeMounts:
{{- include "pulsar.zookeeper.data.volumeMounts" . | nindent 8 }}
{{- include "pulsar.zookeeper.log.volumeMounts" . | nindent 8 }}
- name: backup-config
mountPath: /pulsar-metadata-tool/conf/pulsar-metadata-tool
env:
Expand Down Expand Up @@ -176,12 +175,10 @@ spec:
volumeMounts:
{{- include "pulsar.zookeeper.data.volumeMounts" . | nindent 8 }}
{{- include "pulsar.zookeeper.certs.volumeMounts" . | nindent 8 }}
{{- include "pulsar.zookeeper.log.volumeMounts" . | nindent 8 }}
{{- include "pulsar.zookeeper.genzkconf.volumeMounts" . | nindent 8 }}
volumes:
{{- include "pulsar.zookeeper.data.volumes" . | nindent 6 }}
{{- include "pulsar.zookeeper.certs.volumes" . | nindent 6 }}
{{- include "pulsar.zookeeper.log.volumes" . | nindent 6 }}
{{- include "pulsar.zookeeper.genzkconf.volumes" . | nindent 6 }}
{{- if .Values.zookeeper.customTools.backup.enable }}
- name: backup-config
Expand Down
2 changes: 0 additions & 2 deletions charts/sn-platform-slim/templates/zookeeper/zookeeper-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ spec:
volumes:
{{- include "pulsar.zookeeper.data.volumes" . | nindent 4 }}
{{- include "pulsar.zookeeper.certs.volumes" . | nindent 4 }}
{{- include "pulsar.zookeeper.log.volumes" . | nindent 4 }}
{{- include "pulsar.zookeeper.genzkconf.volumes" . | nindent 4 }}
{{- if .Values.zookeeper.customTools.restore.enable }}
- name: restore-config
Expand Down Expand Up @@ -223,7 +222,6 @@ spec:
volumeMounts:
{{- include "pulsar.zookeeper.data.volumeMounts" . | nindent 6 }}
{{- include "pulsar.zookeeper.certs.volumeMounts" . | nindent 6 }}
{{- include "pulsar.zookeeper.log.volumeMounts" . | nindent 6 }}
{{- include "pulsar.zookeeper.genzkconf.volumeMounts" . | nindent 6 }}
{{- end }}
{{- if and (not .Values.zookeeper.operator.adopt_existing) .Values.tls.zookeeper.enabled }}
Expand Down
18 changes: 0 additions & 18 deletions charts/sn-platform/templates/bookkeeper/_autorecovery.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,24 +137,6 @@ until bin/bookkeeper shell whatisinstanceid; do
done;
{{- end }}

{{/*
Define autorecovery log mounts
*/}}
{{- define "pulsar.autorecovery.log.volumeMounts" -}}
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.autorecovery.component }}-log4j2"
mountPath: "{{ template "pulsar.home" . }}/conf/log4j2.yaml"
subPath: log4j2.yaml
{{- end }}

{{/*
Define autorecovery log volumes
*/}}
{{- define "pulsar.autorecovery.log.volumes" -}}
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.autorecovery.component }}-log4j2"
configMap:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.autorecovery.component }}"
{{- end }}

{{/*
Define Autorecovery TLS certificate secret name
*/}}
Expand Down
18 changes: 0 additions & 18 deletions charts/sn-platform/templates/bookkeeper/_bookkeeper.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,24 +144,6 @@ done;
{{- end }}
{{- end }}

{{/*
Define bookkeeper log mounts
*/}}
{{- define "pulsar.bookkeeper.log.volumeMounts" -}}
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.bookkeeper.component }}-log4j2"
mountPath: "{{ template "pulsar.home" .}}/conf/log4j2.yaml"
subPath: log4j2.yaml
{{- end }}

{{/*
Define bookkeeper log volumes
*/}}
{{- define "pulsar.bookkeeper.log.volumes" -}}
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.bookkeeper.component }}-log4j2"
configMap:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.bookkeeper.component }}"
{{- end }}

{{/*Define bookkeeper pod name*/}}
{{- define "pulsar.bookkeeper.podName" -}}
{{- print "bookie" -}}
Expand Down
2 changes: 0 additions & 2 deletions charts/sn-platform/templates/bookkeeper/bookkeeper-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ spec:
emptyDir: {}
{{- end }}
{{- include "pulsar.bookkeeper.certs.volumes" . | nindent 4 }}
{{- include "pulsar.bookkeeper.log.volumes" . | nindent 4 }}
{{- end }}
{{- if and (not .Values.bookkeeper.operator.adopt_existing) .Values.tls.bookie.enabled }}
volumes:
Expand Down Expand Up @@ -291,7 +290,6 @@ spec:
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.bookkeeper.component }}-{{ .Values.bookkeeper.volumes.ledgers.name }}"
mountPath: /pulsar/data/bookkeeper/ledgers
{{- include "pulsar.bookkeeper.certs.volumeMounts" . | nindent 6 }}
{{- include "pulsar.bookkeeper.log.volumeMounts" . | nindent 6 }}
{{- end }}
{{- if and (not .Values.bookkeeper.operator.adopt_existing) .Values.tls.bookie.enabled }}
volumeMounts:
Expand Down
18 changes: 0 additions & 18 deletions charts/sn-platform/templates/broker/_broker.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,24 +124,6 @@ Define broker tls certs volumes
{{- end }}
{{- end }}

{{/*
Define broker log mounts
*/}}
{{- define "pulsar.broker.log.volumeMounts" -}}
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}-log4j2"
mountPath: "{{ template "pulsar.home" .}}/conf/log4j2.yaml"
subPath: log4j2.yaml
{{- end }}

{{/*
Define broker log volumes
*/}}
{{- define "pulsar.broker.log.volumes" -}}
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}-log4j2"
configMap:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}"
{{- end }}

{{/*
Define function worker config volume mount
*/}}
Expand Down
18 changes: 0 additions & 18 deletions charts/sn-platform/templates/proxy/_proxy.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,24 +77,6 @@ Define proxy certs volumes
{{- end }}
{{- end }}

{{/*
Define proxy log mounts
*/}}
{{- define "pulsar.proxy.log.volumeMounts" -}}
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}-log4j2"
mountPath: "{{ template "pulsar.home" . }}/conf/log4j2.yaml"
subPath: log4j2.yaml
{{- end }}

{{/*
Define proxy log volumes
*/}}
{{- define "pulsar.proxy.log.volumes" -}}
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}-log4j2"
configMap:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}"
{{- end }}

{{/*Define proxy pod name*/}}
{{- define "pulsar.proxy.containerName" -}}
{{- print "pulsar-proxy" -}}
Expand Down
18 changes: 0 additions & 18 deletions charts/sn-platform/templates/zookeeper/_zookeeper.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,24 +93,6 @@ Define zookeeper certs volumes
{{- end }}


{{/*
Define zookeeper log mounts
*/}}
{{- define "pulsar.zookeeper.log.volumeMounts" -}}
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.zookeeper.component }}-log4j2"
mountPath: "{{ template "pulsar.home" . }}/conf/log4j2.yaml"
subPath: log4j2.yaml
{{- end }}

{{/*
Define zookeeper log volumes
*/}}
{{- define "pulsar.zookeeper.log.volumes" -}}
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.zookeeper.component }}-log4j2"
configMap:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.zookeeper.component }}"
{{- end }}

{{/*Define zookeeper pod name*/}}
{{- define "pulsar.zookeeper.podName" -}}
{{- print "zookeeper" -}}
Expand Down
3 changes: 0 additions & 3 deletions charts/sn-platform/templates/zookeeper/zookeeper-backup-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ spec:
bin/pulsar-metadata-tool backup
volumeMounts:
{{- include "pulsar.zookeeper.data.volumeMounts" . | nindent 8 }}
{{- include "pulsar.zookeeper.log.volumeMounts" . | nindent 8 }}
- name: backup-config
mountPath: /pulsar-metadata-tool/conf/pulsar-metadata-tool
env:
Expand Down Expand Up @@ -176,12 +175,10 @@ spec:
volumeMounts:
{{- include "pulsar.zookeeper.data.volumeMounts" . | nindent 8 }}
{{- include "pulsar.zookeeper.certs.volumeMounts" . | nindent 8 }}
{{- include "pulsar.zookeeper.log.volumeMounts" . | nindent 8 }}
{{- include "pulsar.zookeeper.genzkconf.volumeMounts" . | nindent 8 }}
volumes:
{{- include "pulsar.zookeeper.data.volumes" . | nindent 6 }}
{{- include "pulsar.zookeeper.certs.volumes" . | nindent 6 }}
{{- include "pulsar.zookeeper.log.volumes" . | nindent 6 }}
{{- include "pulsar.zookeeper.genzkconf.volumes" . | nindent 6 }}
{{- if .Values.zookeeper.customTools.backup.enable }}
- name: backup-config
Expand Down
2 changes: 0 additions & 2 deletions charts/sn-platform/templates/zookeeper/zookeeper-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ spec:
volumes:
{{- include "pulsar.zookeeper.data.volumes" . | nindent 4 }}
{{- include "pulsar.zookeeper.certs.volumes" . | nindent 4 }}
{{- include "pulsar.zookeeper.log.volumes" . | nindent 4 }}
{{- include "pulsar.zookeeper.genzkconf.volumes" . | nindent 4 }}
{{- if .Values.zookeeper.customTools.restore.enable }}
- name: restore-config
Expand Down Expand Up @@ -223,7 +222,6 @@ spec:
volumeMounts:
{{- include "pulsar.zookeeper.data.volumeMounts" . | nindent 6 }}
{{- include "pulsar.zookeeper.certs.volumeMounts" . | nindent 6 }}
{{- include "pulsar.zookeeper.log.volumeMounts" . | nindent 6 }}
{{- include "pulsar.zookeeper.genzkconf.volumeMounts" . | nindent 6 }}
{{- end }}
{{- if and (not .Values.zookeeper.operator.adopt_existing) .Values.tls.zookeeper.enabled }}
Expand Down
Loading