From 92c551f5f28ea6e91e4af3bfd6c0808a78f2ac63 Mon Sep 17 00:00:00 2001
From: Li Li <urfree@apache.org>
Date: Tue, 22 Oct 2024 09:51:57 +0800
Subject: [PATCH] upgrade console to v2.3.9 (#1186)

update

Signed-off-by: lili <lli@streamnative.io>
---
 .../templates/bookkeeper/bookkeeper-cluster.yaml               | 1 -
 .../templates/zookeeper/zookeeper-backup-configmap.yaml        | 3 ---
 .../templates/zookeeper/zookeeper-cluster.yaml                 | 3 ---
 charts/sn-platform-slim/values.yaml                            | 2 +-
 .../sn-platform/templates/bookkeeper/bookkeeper-cluster.yaml   | 1 -
 .../templates/zookeeper/zookeeper-backup-configmap.yaml        | 3 ---
 charts/sn-platform/templates/zookeeper/zookeeper-cluster.yaml  | 3 ---
 7 files changed, 1 insertion(+), 15 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-slim/values.yaml b/charts/sn-platform-slim/values.yaml
index 044718562..f00e86a62 100644
--- a/charts/sn-platform-slim/values.yaml
+++ b/charts/sn-platform-slim/values.yaml
@@ -174,7 +174,7 @@ images:
     pullPolicy: IfNotPresent
   streamnative_console:
     repository: streamnative/private-cloud-console
-    tag: "v2.3.8"
+    tag: "v2.3.9"
     pullPolicy: IfNotPresent
     hasCommand: false
   node_exporter:
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: