From 3c90d1fa1ba07f1508b2245224c370a12a423779 Mon Sep 17 00:00:00 2001
From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com>
Date: Wed, 19 Jul 2023 09:25:22 -0400
Subject: [PATCH] chore(stash) remove redundant env + housekeeping **BREAKING
 CHANGES** (#10547)

---
 charts/stable/stash/Chart.yaml        |  2 +-
 charts/stable/stash/ci/ct-values.yaml | 15 --------
 charts/stable/stash/questions.yaml    | 39 +++++++++++++--------
 charts/stable/stash/values.yaml       | 50 ++++++++++++++++++---------
 4 files changed, 60 insertions(+), 46 deletions(-)
 delete mode 100644 charts/stable/stash/ci/ct-values.yaml

diff --git a/charts/stable/stash/Chart.yaml b/charts/stable/stash/Chart.yaml
index af9ce8cca02..fc2f8d9cd31 100644
--- a/charts/stable/stash/Chart.yaml
+++ b/charts/stable/stash/Chart.yaml
@@ -18,7 +18,7 @@ name: stash
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/stash
   - https://github.com/stashapp/stash
-version: 10.0.25
+version: 11.0.0
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/stable/stash/ci/ct-values.yaml b/charts/stable/stash/ci/ct-values.yaml
deleted file mode 100644
index 322b5784ed3..00000000000
--- a/charts/stable/stash/ci/ct-values.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-env:
-  STASH_PORT: 9999
-  STASH_STASH: "/media"
-  STASH_GENERATED: "/root/.stash/generated"
-  STASH_METADATA: "/root/.stash/metadata"
-  STASH_CACHE: "/root/.stash/cache"
-persistence:
-  config:
-    enabled: true
-    type: emptyDir
-    mountPath: /root/.stash
-  media:
-    enabled: true
-    type: emptyDir
-    mountPath: /media
diff --git a/charts/stable/stash/questions.yaml b/charts/stable/stash/questions.yaml
index a10c03b7d01..17cc6eee8c4 100644
--- a/charts/stable/stash/questions.yaml
+++ b/charts/stable/stash/questions.yaml
@@ -11,19 +11,6 @@ questions:
 # Include{podSpec}
 # Include{containerMain}
 
-
-                                - variable: env
-                                  group: "App Configuration"
-                                  label: "Image Environment"
-                                  schema:
-                                    additional_attrs: true
-                                    type: dict
-                                    attrs:
-                                      - variable: STASH_PORT
-                                        label: "STASH_PORT"
-                                        schema:
-                                          type: int
-                                          default: 9999
 # Include{containerBasic}
 # Include{containerAdvanced}
 
@@ -57,6 +44,30 @@ questions:
             additional_attrs: true
             type: dict
             attrs:
+# Include{persistenceBasic}
+        - variable: cache
+          label: "App Cache Storage"
+          description: "Stores the Application Cache."
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+# Include{persistenceBasic}
+        - variable: metadata
+          label: "App MetaData Storage"
+          description: "Stores the Application MetaData."
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+# Include{persistenceBasic}
+        - variable: data
+          label: "App Data Storage"
+          description: "Stores the Application Data."
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
 # Include{persistenceBasic}
 # Include{persistenceList}
 # Include{ingressRoot}
@@ -81,7 +92,7 @@ questions:
                   default: 0
               - variable: runAsGroup
                 label: "runAsGroup"
-                description: "The groupID this App of the user running the application"
+                description: "The groupID of the user running the application"
                 schema:
                   type: int
                   default: 0
diff --git a/charts/stable/stash/values.yaml b/charts/stable/stash/values.yaml
index 8bf659cf34e..094f42a0667 100644
--- a/charts/stable/stash/values.yaml
+++ b/charts/stable/stash/values.yaml
@@ -2,23 +2,20 @@ image:
   repository: tccr.io/truecharts/stash
   tag: v0.21.0@sha256:0cc9317fd946f62239e1a25bf433ec222926afe51ab19371e38f17bf40aee240
   pullPolicy: IfNotPresent
+
+securityContext:
+  container:
+    runAsNonRoot: false
+    readOnlyRootFilesystem: false
+    runAsUser: 0
+    runAsGroup: 0
+
 service:
   main:
     ports:
       main:
         port: 9999
-persistence:
-  config:
-    enabled: true
-    mountPath: "/root/.stash"
-portal:
-  open:
-    enabled: true
-securityContext:
-  container:
-    runAsNonRoot: false
-    runAsUser: 0
-    runAsGroup: 0
+
 workload:
   main:
     podSpec:
@@ -26,7 +23,28 @@ workload:
         main:
           env:
             STASH_PORT: "{{ .Values.service.main.ports.main.port }}"
-            # STASH_STASH:
-            # STASH_GENERATED:
-            # STASH_METADATA:
-            # STASH_CACHE:
+            STASH_STASH: /data
+            STASH_GENERATED: /generated
+            STASH_METADATA: /metadata
+            STASH_CACHE: /cache
+
+persistence:
+  config:
+    enabled: true
+    mountPath: "/root/.stash"
+  cache:
+    enabled: true
+    mountPath: "/cache"
+  generated:
+    enabled: true
+    mountPath: "/generated"
+  metadata:
+    enabled: true
+    mountPath: "/metadata"
+  data:
+    enabled: true
+    mountPath: "/data"
+
+portal:
+  open:
+    enabled: true