Merge pull request #52 from truenas/NAS-110399

Allow specifying extra host path volumes for nextcloud/plex

test/nextcloud/1.2.1/Chart.yaml → test/nextcloud/1.2.2/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: nextcloud
-version: 1.2.1
+version: 1.2.2
 appVersion: 20.0.7
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:

test/nextcloud/1.2.1/questions.yaml → test/nextcloud/1.2.2/questions.yaml

@@ -134,6 +134,31 @@ questions:
                         type: hostpath
                         required: true
 
+  - variable: extraAppVolumeMounts
+    label: "Nextcloud Extra Host Path Volumes"
+    group: "Storage"
+    schema:
+      type: list
+      items:
+        - variable: extraAppVolume
+          label: "Nextcloud Host Path Volume"
+          description: "Add an extra host path volume for nextcloud application"
+          schema:
+            type: dict
+            attrs:
+              - variable: mountPath
+                label: "Mount Path in Pod"
+                description: "Path where the volume will be mounted inside the pod"
+                schema:
+                  type: path
+                  required: true
+              - variable: hostPath
+                label: "Host Path"
+                description: "Host path"
+                schema:
+                  type: hostpath
+                  required: true
+
   - variable: postgresAppVolumeMounts
     label: "Postgres Storage"
     group: "Storage"

test/nextcloud/1.2.1/templates/deployment.yaml → test/nextcloud/1.2.2/templates/deployment.yaml

@@ -48,7 +48,16 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
         - name: nextcloud-data
           mountPath: /var/www/html/themes
           subPath: "themes"
+        {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }}
+        - name: extrappvolume-{{ $index }}
+          mountPath: {{ $hostPathConfiguration.mountPath }}
+        {{ end }}
 {{ include "common.storage.allAppVolumes" .Values | nindent 6 }}
+      {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }}
+        - name: extrappvolume-{{ $index }}
+          hostPath:
+            path: {{ $hostPathConfiguration.hostPath }}
+      {{ end }}
       # Will mount configuration files as www-data (id: 33) for nextcloud
       securityContext:
         fsGroup: 33

test/plex/1.3.0/Chart.yaml → test/plex/1.4.0/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 1.21.3.4046-3c1c83ba4
 description: Plex Media Server
 name: plex
-version: 1.3.0
+version: 1.4.0
 keywords:
   - plex
 home: https://plex.tv/

test/plex/1.3.0/questions.yaml → test/plex/1.4.0/questions.yaml

@@ -264,3 +264,28 @@ questions:
                   type: path
                   editable: false
                   default: "/config/Library/Application Support/Plex Media Server/Logs"
+
+  - variable: extraAppVolumeMounts
+    label: "Plex Extra Host Path Volumes"
+    group: "Storage"
+    schema:
+      type: list
+      items:
+        - variable: extraAppVolume
+          label: "Plex Host Path Volume"
+          description: "Add an extra host path volume for plex application"
+          schema:
+            type: dict
+            attrs:
+              - variable: mountPath
+                label: "Mount Path in Pod"
+                description: "Path where the volume will be mounted inside the pod"
+                schema:
+                  type: path
+                  required: true
+              - variable: hostPath
+                label: "Host Path"
+                description: "Host path"
+                schema:
+                  type: hostpath
+                  required: true

test/plex/1.3.0/templates/deployment.yaml → test/plex/1.4.0/templates/deployment.yaml

@@ -15,6 +15,10 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
               mountPath: /bin/plex_probe_check.sh
               readOnly: true
               subPath: entrypoint.sh
+            {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }}
+            - name: extrappvolume-{{ $index }}
+              mountPath: {{ $hostPathConfiguration.mountPath }}
+            {{ end }}
           ports:
           - name: pms
             protocol: TCP
@@ -82,3 +86,8 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
           configMap:
             defaultMode: 0700
             name: "plex-probe-check"
+        {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }}
+        - name: extrappvolume-{{ $index }}
+          hostPath:
+            path: {{ $hostPathConfiguration.hostPath }}
+        {{ end }}