Add a way to remove any subpath

acdh-oeaw · May 13, 2024 · 10d1903 · 10d1903
1 parent aade471
commit 10d1903
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git 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,14 +72,22 @@ 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
         terminationMessagePolicy: File
         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
@@ -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
@@ -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
@@ -85,3 +85,4 @@ affinity: {}
 
 persistence:
   imageStoragePVC: iiif-picture-storage
+#  imageStorageSubPath:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -85,3 +85,4 @@ affinity: {}

		persistence:
		imageStoragePVC: iiif-picture-storage
		# imageStorageSubPath: