This is an automated email from the ASF dual-hosted git repository.
xuba pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git
The following commit(s) were added to refs/heads/master by this push:
new f03d28dd9 [AMORO-3549] Fix AMS helm chart cannot set log4j2 because of
wrong indentation (#3550)
f03d28dd9 is described below
commit f03d28dd91fe90ff224b512e2a929565de1fc471
Author: Han You <[email protected]>
AuthorDate: Wed May 21 10:23:12 2025 -0500
[AMORO-3549] Fix AMS helm chart cannot set log4j2 because of wrong
indentation (#3550)
AMORO-3549 AMS helm chart cannot set log4j2 because of wrong indentation
---
charts/amoro/templates/_pod.tpl | 2 +-
charts/amoro/tests/amoro-deployment_test.yaml | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/charts/amoro/templates/_pod.tpl b/charts/amoro/templates/_pod.tpl
index 721860306..80213171b 100644
--- a/charts/amoro/templates/_pod.tpl
+++ b/charts/amoro/templates/_pod.tpl
@@ -54,7 +54,7 @@
readOnly: true
subPath: "config.yaml"
{{- if or .Values.amoroConf.log4j2 }}
-{{- /* log4j2.yaml from config-map*/ -}}
+{{/* log4j2.yaml from config-map*/}}
- name: conf
mountPath: {{ include "amoro.home" . }}/conf/log4j2.xml
readOnly: true
diff --git a/charts/amoro/tests/amoro-deployment_test.yaml
b/charts/amoro/tests/amoro-deployment_test.yaml
index 5384e9bc5..eba137fef 100644
--- a/charts/amoro/tests/amoro-deployment_test.yaml
+++ b/charts/amoro/tests/amoro-deployment_test.yaml
@@ -364,4 +364,12 @@ tests:
- key: disktype
operator: In
values:
- - ssd
\ No newline at end of file
+ - ssd
+ - it: Amoro Deployment should allow setting custom log4j2 config
+ template: amoro-deployment.yaml
+ set:
+ amoroConf:
+ log4j2: "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Configuration
status=\"WARN\"></Configuration>" # minimal log4j2 config
+ asserts:
+ - exists:
+ path: spec.template.spec.containers[?(@.name ==
"amoro-ams")].volumeMounts[?(@.subPath == "log4j2.xml")]
