From 514c9542e159b9facd5da9f4b47b9cda6b15d5b6 Mon Sep 17 00:00:00 2001
From: wkbrd <30599409+wkbrd@users.noreply.github.com>
Date: Thu, 19 Jun 2025 07:43:36 -0400
Subject: [PATCH] Make mime.types able to be overridden. Make temporary volumes
 more scoped.

---
 charts/questdb/templates/_helpers.tpl     |  9 ++++++++
 charts/questdb/templates/config.yaml      |  7 +++++++
 charts/questdb/templates/statefulset.yaml | 25 ++++++++++++++++++++---
 charts/questdb/values.yaml                |  3 +++
 4 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/charts/questdb/templates/_helpers.tpl b/charts/questdb/templates/_helpers.tpl
index 267f979..48dba79 100644
--- a/charts/questdb/templates/_helpers.tpl
+++ b/charts/questdb/templates/_helpers.tpl
@@ -80,6 +80,15 @@ Generate log.conf file content
 {{- end }}
 {{- end }}
 
+{{/*
+Generate mime.types file content
+*/}}
+{{- define "generateMimeConfig" -}}
+{{- range $key, $value := index .Values.questdb.mimeConfig.options }}
+{{ $key }}   {{ $value }}
+{{- end }}
+{{- end }}
+
 {{/*
 Build openshift detection
 */}}
diff --git a/charts/questdb/templates/config.yaml b/charts/questdb/templates/config.yaml
index e085861..4f4c856 100644
--- a/charts/questdb/templates/config.yaml
+++ b/charts/questdb/templates/config.yaml
@@ -18,6 +18,9 @@ data:
   {{- if .Values.questdb.loggingConfig.enabled }}
   log.conf: {{ include "generateLogConfig" . | b64enc -}}
   {{- end }}
+  {{- if .Values.questdb.mimeConfig.enabled }}
+  mime.types: {{ include "generateMimeConfig" . | b64enc -}}
+  {{- end }}
 {{- else }}
 data:
   {{- if .Values.questdb.serverConfig.enabled }}
@@ -28,5 +31,9 @@ data:
   log.conf: |
     {{- include "generateLogConfig" . | nindent 4 -}}
   {{- end }}
+  {{- if .Values.questdb.mimeConfig.enabled }}
+  mime.types: |
+    {{- include "generateMimeConfig" . | nindent 4 -}}
+  {{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/questdb/templates/statefulset.yaml b/charts/questdb/templates/statefulset.yaml
index 0a77625..bf21511 100644
--- a/charts/questdb/templates/statefulset.yaml
+++ b/charts/questdb/templates/statefulset.yaml
@@ -52,8 +52,10 @@ spec:
           volumeMounts:
           - name: tmpfs-tmp
             mountPath: /tmp
-          - name: tmpfs-questdb
-            mountPath: /var/lib/questdb
+          - name: tmpfs-questdb-import
+            mountPath: /var/lib/questdb/import
+          - name: tmpfs-questdb-public
+            mountPath: /var/lib/questdb/public
           - name: {{ include "questdb.fullname" . }}
             mountPath: {{ .Values.questdb.dataDir }}/db
             subPath: db/
@@ -73,6 +75,11 @@ spec:
             mountPath: {{ .Values.questdb.dataDir }}/conf/log.conf
             subPath: log.conf
           {{- end }}
+          {{- if .Values.questdb.mimeConfig.enabled }}
+          - name: mime-config
+            mountPath: {{ .Values.questdb.dataDir }}/conf/mime.types
+            subPath: mime.types
+          {{- end }}
           {{- if .Values.extraVolumeMounts }}
             {{ toYaml .Values.extraVolumeMounts | nindent 10 }}
           {{- end }}
@@ -137,7 +144,9 @@ spec:
       volumes:
         - name: tmpfs-tmp
           emptyDir: {}
-        - name: tmpfs-questdb
+        - name: tmpfs-questdb-import
+          emptyDir: {}
+        - name: tmpfs-questdb-public
           emptyDir: {}
         {{- if .Values.questdb.serverConfig.enabled }}
         - name: server-config
@@ -159,6 +168,16 @@ spec:
             name: {{ include "questdb.fullname" . }}
           {{- end }}
         {{- end }}
+        {{- if .Values.questdb.mimeConfig.enabled }}
+        - name: mime-config
+          {{- if eq .Values.questdb.configStorageType "Secret" }}
+          secret:
+              secretName: {{ include "questdb.fullname" . }}
+          {{- else }}
+          configMap:
+            name: {{ include "questdb.fullname" . }}
+          {{- end }}
+        {{- end }}
         - name: migration-scripts
           configMap:
             name: {{ include "questdb.fullname" . }}-db-migrations
diff --git a/charts/questdb/values.yaml b/charts/questdb/values.yaml
index a1d7d8a..d9db156 100644
--- a/charts/questdb/values.yaml
+++ b/charts/questdb/values.yaml
@@ -39,6 +39,9 @@ questdb:
   loggingConfig:
     enabled: false
     options: {}
+  mimeConfig:
+    enabled: false
+    options: {}
   # env supports key/value pairs that are added directly to the questdb statefulset's env
   env: {}
   # envFrom supports a list of sources that will be injected into the questdb statefulset's env