From 18c7adb645656f2846dc6e3b9a03f70df719181a Mon Sep 17 00:00:00 2001
From: alisihab <sihab.akcan@gmail.com>
Date: Mon, 29 Jul 2024 11:27:25 +0200
Subject: [PATCH] Include logback.xml in the ConfigMap (#18)

* Include logback.xml in the ConfigMap

* bump version

* logback with multiline string notation
---
 charts/drill/Chart.yaml                       |  2 +-
 .../drill/templates/configmap.override.yaml   | 27 +++++++++++++++++
 charts/drill/templates/statefulset.yaml       | 29 +------------------
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/charts/drill/Chart.yaml b/charts/drill/Chart.yaml
index 9140b59..e991a23 100644
--- a/charts/drill/Chart.yaml
+++ b/charts/drill/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: drill
-version: 1.3.1
+version: 1.3.2
 appVersion: 1.21.1
 description: Helm Charts for deploying Apache Drill Clusters on Kubernetes
 icon: https://raw.githubusercontent.com/wearefrank/charts/master/charts/drill/icon.svg
diff --git a/charts/drill/templates/configmap.override.yaml b/charts/drill/templates/configmap.override.yaml
index 14fdb99..fa62591 100644
--- a/charts/drill/templates/configmap.override.yaml
+++ b/charts/drill/templates/configmap.override.yaml
@@ -32,4 +32,31 @@ data:
   storage-plugins-override.conf: |-
     {{- toString . | nindent 4 }}
   {{- end }}
+  logback.xml: |-
+    <configuration>
+      <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>/var/lib/drill/log/drill.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+            <fileNamePattern>/var/lib/drill/log/drill.%i.log</fileNamePattern>
+            <minIndex>1</minIndex>
+            <maxIndex>9</maxIndex>
+        </rollingPolicy>
+
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <maxFileSize>5MB</maxFileSize>
+        </triggeringPolicy>
+
+        <encoder>
+            <pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern>
+        </encoder>
+      </appender>
+
+      <root level="debug">
+          <appender-ref ref="FILE"/>
+      </root>
+
+      <logger name="org.apache.drill" level="trace"/>
+      <logger name="org.apache.calcite" level="trace"/>
+      <logger name="org.apache.zookeeper" level="trace"/>
+    </configuration>
 {{- end -}}
\ No newline at end of file
diff --git a/charts/drill/templates/statefulset.yaml b/charts/drill/templates/statefulset.yaml
index 4d4da7a..3fed58b 100644
--- a/charts/drill/templates/statefulset.yaml
+++ b/charts/drill/templates/statefulset.yaml
@@ -43,34 +43,7 @@ spec:
           command:
             - /bin/bash
             - -c
-            - "echo '<configuration>
-                              <appender name=\"FILE\" class=\"ch.qos.logback.core.rolling.RollingFileAppender\">
-                                  <file>/var/lib/drill/log/drill.log</file>
-                                  <rollingPolicy class=\"ch.qos.logback.core.rolling.FixedWindowRollingPolicy\">
-                                      <fileNamePattern>/var/lib/drill/log/drill.%i.log</fileNamePattern>
-                                      <minIndex>1</minIndex>
-                                      <maxIndex>9</maxIndex>
-                                  </rollingPolicy>
-                                  
-                                  <triggeringPolicy class=\"ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy\">
-                                      <maxFileSize>5MB</maxFileSize>
-                                  </triggeringPolicy>
-                                  
-                                  <encoder>
-                                      <pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern>
-                                  </encoder>
-                              </appender>
-
-                              <root level=\"debug\">
-                                  <appender-ref ref=\"FILE\"/>
-                              </root>
-
-                              <logger name=\"org.apache.drill\" level=\"trace\"/>
-                              <logger name=\"org.apache.calcite\" level=\"trace\"/>
-                              <logger name=\"org.apache.zookeeper\" level=\"trace\"/>
-                            </configuration>' > /opt/drill/conf/logback.xml && 
-                            ${DRILL_HOME}/bin/drillbit.sh start && 
-                            tail -f /var/lib/drill/log/drillbit.out"
+            - "${DRILL_HOME}/bin/drillbit.sh start && tail -f /var/lib/drill/log/drillbit.out"
           ports:
             - containerPort: 8047
               name: web