From 12d428b77831543c3a6f07b9598aaaf62c6b360a Mon Sep 17 00:00:00 2001 From: DonglaiFu Date: Tue, 22 Oct 2024 21:05:35 +0800 Subject: [PATCH] Remove unused log conf for all components (#1188) upgrade console to v2.3.9 (#1186) update Signed-off-by: lili Co-authored-by: Li Li --- .../templates/bookkeeper/bookkeeper-cluster.yaml | 1 - .../templates/zookeeper/zookeeper-backup-configmap.yaml | 3 --- .../templates/zookeeper/zookeeper-cluster.yaml | 3 --- .../sn-platform/templates/bookkeeper/bookkeeper-cluster.yaml | 1 - .../templates/zookeeper/zookeeper-backup-configmap.yaml | 3 --- charts/sn-platform/templates/zookeeper/zookeeper-cluster.yaml | 3 --- 6 files changed, 14 deletions(-) diff --git a/charts/sn-platform-slim/templates/bookkeeper/bookkeeper-cluster.yaml b/charts/sn-platform-slim/templates/bookkeeper/bookkeeper-cluster.yaml index 1003f2392..76efd4402 100644 --- a/charts/sn-platform-slim/templates/bookkeeper/bookkeeper-cluster.yaml +++ b/charts/sn-platform-slim/templates/bookkeeper/bookkeeper-cluster.yaml @@ -239,7 +239,6 @@ spec: {{- with .Values.autorecovery.configData }} {{ toYaml . | indent 6 }} {{- end }} -{{ (.Files.Glob "conf/autorecovery/log4j2.yaml").AsConfig | indent 6 }} apiObjects: clientService: {} headlessService: diff --git a/charts/sn-platform-slim/templates/zookeeper/zookeeper-backup-configmap.yaml b/charts/sn-platform-slim/templates/zookeeper/zookeeper-backup-configmap.yaml index 1108dda12..ab6eb9d54 100644 --- a/charts/sn-platform-slim/templates/zookeeper/zookeeper-backup-configmap.yaml +++ b/charts/sn-platform-slim/templates/zookeeper/zookeeper-backup-configmap.yaml @@ -35,7 +35,4 @@ data: {{- end }} PULSAR_PREFIX_peerType: "observer" {{ toYaml .Values.zookeeper.customTools.backup.configData | indent 2 }} - # Include log configuration file, If you want to configure the log level and other configuration - # items, you can modify the configmap, and eventually it will overwrite the log4j2.yaml file under conf -{{ (.Files.Glob "conf/zookeeper/log4j2.yaml").AsConfig | indent 2 }} {{- end }} diff --git a/charts/sn-platform-slim/templates/zookeeper/zookeeper-cluster.yaml b/charts/sn-platform-slim/templates/zookeeper/zookeeper-cluster.yaml index 6cf014f31..8d48e2b65 100644 --- a/charts/sn-platform-slim/templates/zookeeper/zookeeper-cluster.yaml +++ b/charts/sn-platform-slim/templates/zookeeper/zookeeper-cluster.yaml @@ -201,9 +201,6 @@ spec: {{- with .Values.zookeeper.configData }} {{ toYaml . | indent 6 }} {{- end }} - # Include log configuration file, If you want to configure the log level and other configuration - # items, you can modify the configmap, and eventually it will overwrite the log4j2.yaml file under conf -{{ (.Files.Glob "conf/zookeeper/log4j2.yaml").AsConfig | indent 6 }} apiObjects: clientService: {} headlessService: diff --git a/charts/sn-platform/templates/bookkeeper/bookkeeper-cluster.yaml b/charts/sn-platform/templates/bookkeeper/bookkeeper-cluster.yaml index 065347bec..dc380a50b 100644 --- a/charts/sn-platform/templates/bookkeeper/bookkeeper-cluster.yaml +++ b/charts/sn-platform/templates/bookkeeper/bookkeeper-cluster.yaml @@ -239,7 +239,6 @@ spec: {{- with .Values.autorecovery.configData }} {{ toYaml . | indent 6 }} {{- end }} -{{ (.Files.Glob "conf/autorecovery/log4j2.yaml").AsConfig | indent 6 }} apiObjects: clientService: {} headlessService: diff --git a/charts/sn-platform/templates/zookeeper/zookeeper-backup-configmap.yaml b/charts/sn-platform/templates/zookeeper/zookeeper-backup-configmap.yaml index 1108dda12..ab6eb9d54 100644 --- a/charts/sn-platform/templates/zookeeper/zookeeper-backup-configmap.yaml +++ b/charts/sn-platform/templates/zookeeper/zookeeper-backup-configmap.yaml @@ -35,7 +35,4 @@ data: {{- end }} PULSAR_PREFIX_peerType: "observer" {{ toYaml .Values.zookeeper.customTools.backup.configData | indent 2 }} - # Include log configuration file, If you want to configure the log level and other configuration - # items, you can modify the configmap, and eventually it will overwrite the log4j2.yaml file under conf -{{ (.Files.Glob "conf/zookeeper/log4j2.yaml").AsConfig | indent 2 }} {{- end }} diff --git a/charts/sn-platform/templates/zookeeper/zookeeper-cluster.yaml b/charts/sn-platform/templates/zookeeper/zookeeper-cluster.yaml index 6cf014f31..8d48e2b65 100644 --- a/charts/sn-platform/templates/zookeeper/zookeeper-cluster.yaml +++ b/charts/sn-platform/templates/zookeeper/zookeeper-cluster.yaml @@ -201,9 +201,6 @@ spec: {{- with .Values.zookeeper.configData }} {{ toYaml . | indent 6 }} {{- end }} - # Include log configuration file, If you want to configure the log level and other configuration - # items, you can modify the configmap, and eventually it will overwrite the log4j2.yaml file under conf -{{ (.Files.Glob "conf/zookeeper/log4j2.yaml").AsConfig | indent 6 }} apiObjects: clientService: {} headlessService: