fix: don't overwrite existing jars

wearefrank · Nov 2, 2023 · 9e67604 · 9e67604
1 parent 8a085d9
commit 9e67604
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/charts/drill/Chart.yaml b/charts/drill/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: drill
-version: 1.2.9
+version: 1.2.10
 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/statefulset.yaml b/charts/drill/templates/statefulset.yaml
@@ -97,9 +97,11 @@ spec:
               subPath: passwd
             - name: {{ template "drill.fullname" . }}-log
               mountPath: /var/lib/drill/log
-            - name: {{ template "drill.fullname" . }}-data
-              mountPath: /opt/drill/jars/3rdparty
-              subPath: 3rdparty
+            {{- range .Values.drill.drivers }}
+            - name: {{ template "drill.fullname" $ }}-data
+              mountPath: "/opt/drill/jars/3rdparty/{{ .name }}.jar"
+              subPath: "3rdparty/{{ .name }}"
+            {{- end }}
       terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
       securityContext:
         {{- toYaml .Values.securityContext | nindent 8 }}
@@ -138,11 +140,11 @@ spec:
         {{- range .Values.drill.drivers }}
         - name: download-{{ .name }}-driver
           image: busybox
-          command: [ 'sh', '-c', 'if [ -f /downloads/{{ .name }}.jar ]; then echo The driver {{ .name }} already exists; else wget -O /downloads/{{ .name }}.jar {{ .url | quote }} {{ if .noCheckCertificate -}} --no-check-certificate {{- end }}; fi' ]
+          command: [ 'sh', '-c', 'if [ -f /downloads/{{ .name }} ]; then echo The driver {{ .name }} already exists; else wget -O /downloads/{{ .name }} {{ .url | quote }} {{ if .noCheckCertificate -}} --no-check-certificate {{- end }}; fi' ]
           volumeMounts:
             - name: {{ template "drill.fullname" $ }}-data
               mountPath: /downloads
-              subPath: 3rdparty
+              subPath: drivers
         {{- end }}
         - name: zookeeper-available
           image: busybox