Include logback.xml in the ConfigMap (#18)

* Include logback.xml in the ConfigMap * bump version * logback with multiline string notation
wearefrank · Jul 29, 2024 · 18c7adb · 18c7adb
1 parent 1cc28f7
commit 18c7adb
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 29 deletions.
diff --git 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
@@ -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 -}}
diff --git 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