From df546465c2d5388ec26652cc87a5ec94db869be6 Mon Sep 17 00:00:00 2001
From: DonglaiFu <labuladong@foxmail.com>
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 <lli@streamnative.io>
Co-authored-by: Li Li <urfree@apache.org>
(cherry picked from commit 12d428b77831543c3a6f07b9598aaaf62c6b360a)
---
 .../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 31c9b8c6f..bfbca1b20 100644
--- a/charts/sn-platform-slim/templates/bookkeeper/bookkeeper-cluster.yaml
+++ b/charts/sn-platform-slim/templates/bookkeeper/bookkeeper-cluster.yaml
@@ -254,7 +254,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 70b8770a7..afa8e09e9 100644
--- a/charts/sn-platform-slim/templates/zookeeper/zookeeper-backup-configmap.yaml
+++ b/charts/sn-platform-slim/templates/zookeeper/zookeeper-backup-configmap.yaml
@@ -50,7 +50,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 b8e24951c..a11f72227 100644
--- a/charts/sn-platform-slim/templates/zookeeper/zookeeper-cluster.yaml
+++ b/charts/sn-platform-slim/templates/zookeeper/zookeeper-cluster.yaml
@@ -216,9 +216,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 c5be0ff7e..719d02616 100644
--- a/charts/sn-platform/templates/bookkeeper/bookkeeper-cluster.yaml
+++ b/charts/sn-platform/templates/bookkeeper/bookkeeper-cluster.yaml
@@ -254,7 +254,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 70b8770a7..afa8e09e9 100644
--- a/charts/sn-platform/templates/zookeeper/zookeeper-backup-configmap.yaml
+++ b/charts/sn-platform/templates/zookeeper/zookeeper-backup-configmap.yaml
@@ -50,7 +50,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 b8e24951c..a11f72227 100644
--- a/charts/sn-platform/templates/zookeeper/zookeeper-cluster.yaml
+++ b/charts/sn-platform/templates/zookeeper/zookeeper-cluster.yaml
@@ -216,9 +216,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: