Merge branch 'main' into openforms2xxllnc

wearefrank · Aug 2, 2024 · 0e41a91 · 0e41a91
2 parents a3729bb + 11da28f
commit 0e41a91
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/charts/drill/Chart.yaml b/charts/drill/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: drill
-version: 1.3.3
+version: 1.3.4
 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
@@ -8,15 +8,13 @@ metadata:
   labels:
     {{- include "drill.labels" . | nindent 4 }}
 data:
-  {{- if (not .Values.drill.overrideConfiguration.existingConfigMap) -}}
   drill-override.conf: |-
     drill.exec: {
       cluster-id: "{{ include "drill.fullname" . }}",
       zk.connect: "{{ include "zookeeper.fullname" . }}:2181",
       http.port: 8047
     }
     {{- toString .Values.drill.overrideConfiguration.drill | nindent 4 }}
-  {{- end -}}
   {{- with .Values.drill.overrideConfiguration.drillMetastore }}
   drill-metastore-override.conf: |-
     {{- toString . | nindent 4 }}
@@ -33,7 +31,6 @@ data:
   storage-plugins-override.conf: |-
     {{- toString . | nindent 4 }}
   {{- end }}
-  {{- if .Values.drill.overrideLogging.enabled -}}
   logback.xml: |-
     <configuration>
       <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -61,4 +58,3 @@ data:
       <logger name="{{ .name }}" level="{{ .level | default "trace" }}"/>
       {{- end }}
     </configuration>
-  {{- end -}}