From dd7542279c6c23bb92d5c133bfdffe3b78af7248 Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Tue, 12 Oct 2021 21:49:08 +0300
Subject: [PATCH] (fix) Update photoprisms pvc's and paths (#1120)

BREAKING CHANGE

Backup your config PVC as they WILL get wiped.
---
 charts/stable/photoprism/Chart.yaml           |  2 +-
 charts/stable/photoprism/SCALE/questions.yaml | 95 ++++++++++++++++---
 charts/stable/photoprism/values.yaml          | 27 ++++--
 3 files changed, 105 insertions(+), 19 deletions(-)

diff --git a/charts/stable/photoprism/Chart.yaml b/charts/stable/photoprism/Chart.yaml
index addd826a97e..36490104d2d 100644
--- a/charts/stable/photoprism/Chart.yaml
+++ b/charts/stable/photoprism/Chart.yaml
@@ -22,4 +22,4 @@ name: photoprism
 sources:
 - https://github.com/photoprism/photoprism
 - https://hub.docker.com/r/photoprism/photoprism
-version: 3.0.9
+version: 4.0.0
diff --git a/charts/stable/photoprism/SCALE/questions.yaml b/charts/stable/photoprism/SCALE/questions.yaml
index fd7090ba638..d852021a385 100644
--- a/charts/stable/photoprism/SCALE/questions.yaml
+++ b/charts/stable/photoprism/SCALE/questions.yaml
@@ -78,20 +78,66 @@ questions:
           schema:
             type: string
             default: "568"
-
-
-        - variable: PHOTOPRISM_STORAGE_PATH
-          label: "PHOTOPRISM_STORAGE_PATH"
-          description: "Photoprism storage path"
-          schema:
-            type: string
-            default: "/photoprism/storage"
         - variable: PHOTOPRISM_ORIGINALS_PATH
           label: "PHOTOPRISM_ORIGINALS_PATH"
           description: "Photoprism originals path"
           schema:
             type: string
             default: "/photoprism/originals"
+        - variable: PHOTOPRISM_IMPORT_PATH
+          label: "PHOTOPRISM_IMPORT_PATH"
+          description: "Photoprism import path"
+          schema:
+            type: string
+            default: "/photoprism/import"
+        - variable: PHOTOPRISM_TEMP_PATH
+          label: "PHOTOPRISM_TEMP_PATH"
+          description: "Photoprism temp path"
+          schema:
+            hidden: true
+            editable: false
+            type: string
+            default: "/photoprism/temp"
+        - variable: PHOTOPRISM_STORAGE_PATH
+          label: "PHOTOPRISM_STORAGE_PATH"
+          description: "Photoprism storage path"
+          schema:
+            hidden: true
+            editable: false
+            type: string
+            default: "/assets/storage"
+        - variable: PHOTOPRISM_SIDECAR_PATH
+          label: "PHOTOPRISM_SIDECAR_PATH"
+          description: "Photoprism sidecar path"
+          schema:
+            hidden: true
+            editable: false
+            type: string
+            default: "/assets/sidecar"
+        - variable: PHOTOPRISM_CACHE_PATH
+          label: "PHOTOPRISM_CACHE_PATH"
+          description: "Photoprism cache path"
+          schema:
+            hidden: true
+            editable: false
+            type: string
+            default: "/assets/cache"
+        - variable: PHOTOPRISM_CONFIG_PATH
+          label: "PHOTOPRISM_CONFIG_PATH"
+          description: "Photoprism config path"
+          schema:
+            hidden: true
+            editable: false
+            type: string
+            default: "/assets/config"
+        - variable: PROTOPRISM_BACKUP_PATH
+          label: "PROTOPRISM_BACKUP_PATH"
+          description: "Photoprism backup path"
+          schema:
+            hidden: true
+            editable: false
+            type: string
+            default: "/assets/backup"
         - variable: PHOTOPRISM_ADMIN_PASSWORD
           label: "PHOTOPRISM_ADMIN_PASSWORD"
           description: "Initial admin password. **BE SURE TO CHANGE THIS!**"
@@ -236,8 +282,8 @@ questions:
     schema:
       type: dict
       attrs:
-        - variable: config
-          label: "App Config Storage"
+        - variable: storage
+          label: "App Storage"
           description: "Stores the Application Configuration."
           schema:
             type: dict
@@ -313,7 +359,7 @@ questions:
                 description: "Path inside the container the storage is mounted"
                 schema:
                   type: string
-                  default: "/photoprism/storage"
+                  default: "/assets"
                   hidden: true
               - variable: medium
                 label: "EmptyDir Medium"
@@ -346,6 +392,33 @@ questions:
                   show_if: [["type", "=", "pvc"]]
                   type: string
                   default: "100Gi"
+        - variable: temp
+          label: "App temp mount"
+          description: "Stores some temporary files"
+          schema:
+            type: dict
+            hidden: true
+            attrs:
+              - variable: enabled
+                label: "Enable the storage"
+                schema:
+                  type: boolean
+                  hidden: true
+                  default: true
+              - variable: type
+                label: "(Advanced) Type of Storage"
+                description: "Sets the persistence type"
+                schema:
+                  type: string
+                  default: "emptyDir"
+                  hidden: true
+              - variable: mountPath
+                label: "mountPath"
+                description: "Path inside the container the storage is mounted"
+                schema:
+                  type: string
+                  default: "/photoprism/temp"
+                  hidden: true
 # Include{persistenceList}
 
   - variable: ingress
diff --git a/charts/stable/photoprism/values.yaml b/charts/stable/photoprism/values.yaml
index ad5d676a469..39b4939917d 100644
--- a/charts/stable/photoprism/values.yaml
+++ b/charts/stable/photoprism/values.yaml
@@ -21,10 +21,22 @@ securityContext:
 env:
   # -- Set the container timezone
   TZ: UTC
-  # -- Photoprism storage path
-  PHOTOPRISM_STORAGE_PATH: /photoprism/storage
   # -- Photoprism originals path
   PHOTOPRISM_ORIGINALS_PATH: /photoprism/originals
+  # -- Photoprism import path
+  PHOTOPRISM_IMPORT_PATH: /photoprism/import
+  # -- Photoprism temp path
+  PHOTOPRISM_TEMP_PATH: /photoprism/temp
+  # -- Photoprism storage path
+  PHOTOPRISM_STORAGE_PATH: /assets/storage
+  # -- Photoprism sidecar path
+  PHOTOPRISM_SIDECAR_PATH: /assets/sidecar
+  # -- Photoprism cache path
+  PHOTOPRISM_CACHE_PATH: /assets/cache
+  # -- Photoprism config path
+  PHOTOPRISM_CONFIG_PATH: /assets/config
+  # -- Photoprism backup path
+  PROTOPRISM_BACKUP_PATH: /assets/backup
   # -- Initial admin password. **BE SURE TO CHANGE THIS!**
   PHOTOPRISM_ADMIN_PASSWORD: "please-change"
   # -- Disable authentication / password protection
@@ -47,13 +59,14 @@ service:
 # -- Configure persistence settings for the chart under this key.
 # @default -- See values.yaml
 persistence:
-  config:
+  storage:
     enabled: true
     type: pvc
     accessMode: ReadWriteOnce
     size: "100Gi"
-    mountPath: /photoprism/storage
+    mountPath: /assets
 
-  originals:
-    enabled: false
-    mountPath: "/photoprism/originals"
+  temp:
+    enabled: true
+    mountPath: /photoprism/temp
+    type: emptyDir