add temp folder and extra volumes

fixes #4

Author: robkooper

templates/deployment.yaml

@@ -22,6 +22,9 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      securityContext:
+        runAsUser: {{ .Values.userid }}
+        runAsGroup: {{ .Values.groupid }}
       initContainers:
         - name: check-mongo
           image: "{{ $.Values.image.checks }}"
@@ -33,15 +36,23 @@ spec:
                   name: {{ .Release.Name }}
                   key: mongodb-uri
 {{- if not (or .Values.storage.s3 .Values.minio.enabled) }}
-        - name: data-chown
-          command: [chown, "{{ .Values.userid }}:{{ .Values.groupid }}", /home/clowder/data]
+        - name: chown-data-folder
           image: busybox:latest
+          command: ["/bin/sh"]
+          args:
+            - -c
+            - >-
+              mkdir {{ .Values.tempfolder }} &&
+              chown "{{ .Values.userid }}:{{ .Values.groupid }}" /home/clowder/data {{ .Values.tempfolder }}
           securityContext:
             runAsUser: 0
             runAsGroup: 0
           volumeMounts:
           - name: data
             mountPath: /home/clowder/data
+          {{- with .Values.extraVolumeMounts }}
+          {{- . | toYaml | nindent 10 }}
+          {{- end }}
 {{- end }}
 {{- if .Values.users }}
 {{- range $index, $element := .Values.users }}
@@ -73,16 +84,14 @@ spec:
               value: {{ .admin | quote }}
 {{- end }}
 {{- end }}
-      securityContext:
-        runAsUser: {{ .Values.userid }}
-        runAsGroup: {{ .Values.groupid }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
             - /home/clowder/clowder.sh
             - -mem {{ .Values.memory }}
+            - -Djava.io.tmpdir={{ .Values.tempfolder }}
 {{- range .Values.extraOptions }}
             - {{ . }}
 {{- end }}
@@ -141,6 +150,9 @@ spec:
             - name: data
               mountPath: /home/clowder/data
 {{- end }}
+            {{- with .Values.extraVolumeMounts }}
+            {{- . | toYaml | nindent 12 }}
+            {{- end }}
           livenessProbe:
             tcpSocket:
               port: clowder
@@ -162,15 +174,18 @@ spec:
                 path: custom.conf
               - key: play.plugins
                 path: play.plugins
-{{- if not (or .Values.storage.s3 .Values.minio.enabled) }}
+        {{- if not (or .Values.storage.s3 .Values.minio.enabled) }}
         - name: data
           persistentVolumeClaim:
-{{- if $.Values.persistence.existingClaim }}
+            {{- if $.Values.persistence.existingClaim }}
             claimName: {{ $.Values.persistence.existingClaim }}
-{{- else }}
+            {{- else }}
             claimName: {{ include "clowder.fullname" . }}-data
-{{- end }}
-{{- end }}
+            {{- end }}
+        {{- end }}
+        {{- with .Values.extraVolumes }}
+          {{- . | toYaml | nindent 8 }}
+        {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

values.yaml

@@ -80,6 +80,9 @@ userid: 10001
 ## to a shared folder.
 groupid: 0
 
+## tempfolder is the place where clowder will safe the files when they are uploaded. Best
+## is for this to be on the same volume as the final storage, or on a fast storage.
+tempfolder: /home/clowder/data/tmp/
 
 # ----------------------------------------------------------------------
 # Configure the ingress object to hook into existing infastructure
@@ -216,6 +219,15 @@ persistence:
   ## Annotations
   annotations: {}
 
+# Add additional volumes and mounts, for example to hold data transfered externally of clowder
+extraVolumes: []
+  # - name: sites
+  #   persistentVolumeClaim:
+  #     claimName: clowder-sites
+extraVolumeMounts: []
+  # - name: sites
+  #   mountPath: /home/clowder/sites
+  #   readOnly: true
 
 # ----------------------------------------------------------------------
 monitor: