From 10d19035e47e0546773e4d352d5788f5359d81a0 Mon Sep 17 00:00:00 2001
From: Omar Siam <Omar.Siam@oeaw.ac.at>
Date: Mon, 13 May 2024 19:00:30 +0200
Subject: [PATCH] Add a way to remove any subpath

---
 chart/templates/deployment-iipsrv.yaml               | 12 ++++++++++--
 .../templates/deployment-imageserver-rev-proxy.yaml  |  2 +-
 chart/templates/deployment-node.yaml                 |  6 ++----
 chart/values.yaml                                    |  1 +
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/chart/templates/deployment-iipsrv.yaml b/chart/templates/deployment-iipsrv.yaml
index 9b2aba2..ae6a6bd 100644
--- a/chart/templates/deployment-iipsrv.yaml
+++ b/chart/templates/deployment-iipsrv.yaml
@@ -62,7 +62,7 @@ spec:
         volumeMounts:
         - mountPath: /data
           name: image-data
-          subPath: {{ .Release.Name }}
+          subPath: {{ kindIs "string" .Values.persistence.imageStorageSubPath | ternary .Values.persistence.imageStorageSubPath .Release.Name | quote }}
       dnsPolicy: ClusterFirst
       initContainers:
       - args:
@@ -72,6 +72,14 @@ spec:
         - -c
         image: busybox
         imagePullPolicy: Always
+        {{- if .Values.application.secretName }}
+        envFrom:
+        - secretRef:
+            name: {{ .Values.application.secretName }}
+{{- if .Values.extraEnvFrom }}
+{{- toYaml .Values.extraEnvFrom | nindent 8 }}
+{{- end }}
+        {{- end }}
         name: {{ .Chart.Name }}-iipsrv-create-foriiif
         resources: {}
         terminationMessagePath: /dev/termination-log
@@ -79,7 +87,7 @@ spec:
         volumeMounts:
         - mountPath: /data
           name: image-data
-          subPath: {{ .Release.Name }}
+          subPath: {{ kindIs "string" .Values.persistence.imageStorageSubPath | ternary .Values.persistence.imageStorageSubPath .Release.Name | quote }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/chart/templates/deployment-imageserver-rev-proxy.yaml b/chart/templates/deployment-imageserver-rev-proxy.yaml
index 988ea7a..f982f77 100644
--- a/chart/templates/deployment-imageserver-rev-proxy.yaml
+++ b/chart/templates/deployment-imageserver-rev-proxy.yaml
@@ -59,7 +59,7 @@ spec:
         volumeMounts:
         - mountPath: /mnt/data
           name: image-data
-          subPath: {{ .Release.Name }}
+          subPath: {{ kindIs "string" .Values.persistence.imageStorageSubPath | ternary .Values.persistence.imageStorageSubPath .Release.Name | quote }}
         - mountPath: /var/tmp
           name: lighttpd-tmp
       {{- with .Values.nodeSelector }}
diff --git a/chart/templates/deployment-node.yaml b/chart/templates/deployment-node.yaml
index e665c0c..71cb9d6 100644
--- a/chart/templates/deployment-node.yaml
+++ b/chart/templates/deployment-node.yaml
@@ -50,14 +50,12 @@ spec:
           privileged: false
           readOnlyRootFilesystem: true
           runAsNonRoot: true
-        stdin: true
         terminationMessagePath: /dev/termination-log
         terminationMessagePolicy: File
-        tty: true
         volumeMounts:
         - mountPath: /data
           name: image-data
-          subPath: {{ .Release.Name }}
+          subPath: {{ kindIs "string" .Values.persistence.imageStorageSubPath | ternary .Values.persistence.imageStorageSubPath .Release.Name | quote }}
       dnsPolicy: ClusterFirst
       initContainers:
       - args:
@@ -74,7 +72,7 @@ spec:
         volumeMounts:
         - mountPath: /data
           name: image-data
-          subPath: {{ .Release.Name }}
+          subPath: {{ kindIs "string" .Values.persistence.imageStorageSubPath | ternary .Values.persistence.imageStorageSubPath .Release.Name | quote }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/chart/values.yaml b/chart/values.yaml
index 8b83e91..03b1a83 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -85,3 +85,4 @@ affinity: {}
 
 persistence:
   imageStoragePVC: iiif-picture-storage
+#  imageStorageSubPath: