From 516938f179b6cf81019c4e19ac123e5edaf015ae Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 12 Aug 2021 14:55:05 +0200
Subject: [PATCH] migrate nextcloud to truecharts postgresql app (#761)

---
 charts/stable/nextcloud/Chart.yaml           |  6 +-
 charts/stable/nextcloud/SCALE/ix_values.yaml |  4 -
 charts/stable/nextcloud/SCALE/questions.yaml | 84 --------------------
 charts/stable/nextcloud/values.yaml          | 14 +---
 4 files changed, 4 insertions(+), 104 deletions(-)

diff --git a/charts/stable/nextcloud/Chart.yaml b/charts/stable/nextcloud/Chart.yaml
index 6ebaab48cb4..cd435a78ab5 100644
--- a/charts/stable/nextcloud/Chart.yaml
+++ b/charts/stable/nextcloud/Chart.yaml
@@ -6,8 +6,8 @@ dependencies:
   version: 6.8.0
 - condition: postgresql.enabled
   name: postgresql
-  repository: https://charts.bitnami.com/bitnami
-  version: 10.9.1
+  repository: https://truecharts.org/
+  version: 1.0.0
 - condition: redis.enabled
   name: redis
   repository: https://charts.bitnami.com/bitnami
@@ -36,4 +36,4 @@ sources:
 - https://github.com/nextcloud/docker
 - https://github.com/nextcloud/helm
 type: application
-version: 1.10.0
+version: 2.0.0
diff --git a/charts/stable/nextcloud/SCALE/ix_values.yaml b/charts/stable/nextcloud/SCALE/ix_values.yaml
index bdfb8775987..ceb84498218 100644
--- a/charts/stable/nextcloud/SCALE/ix_values.yaml
+++ b/charts/stable/nextcloud/SCALE/ix_values.yaml
@@ -153,15 +153,11 @@ cronjob:
   successfulJobsHistoryLimit: 2
 
 # Enabled postgres
-# ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/postgresql
 postgresql:
   enabled: true
   postgresqlUsername: nextcloud
   postgresqlDatabase: nextcloud
   existingSecret: dbcreds
-  persistence:
-    enabled: true
-    existingClaim: db
 
 # Enabled redis
 # ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/redis
diff --git a/charts/stable/nextcloud/SCALE/questions.yaml b/charts/stable/nextcloud/SCALE/questions.yaml
index 23c8aedf6e5..0b65f4b2810 100644
--- a/charts/stable/nextcloud/SCALE/questions.yaml
+++ b/charts/stable/nextcloud/SCALE/questions.yaml
@@ -481,90 +481,6 @@ questions:
                   show_if: [["type", "=", "pvc"]]
                   type: string
                   default: "100Gi"
-        - variable: db
-          label: "Database Storage"
-          description: "Stores the Application database."
-          schema:
-            type: dict
-            attrs:
-              - variable: enabled
-                label: "Enable the storage"
-                schema:
-                  type: boolean
-                  default: true
-                  hidden: true
-              - variable: noMount
-                label: "Do not mount this storage inside the main pod"
-                schema:
-                  type: boolean
-                  default: true
-                  hidden: true
-              - variable: forceName
-                label: "Override PVC Name (advanced)"
-                description: "Forces a certain name for the PVC"
-                schema:
-                  type: string
-                  default: "db"
-                  hidden: true
-              - variable: type
-                label: "(Advanced) Type of Storage"
-                description: "Sets the persistence type"
-                schema:
-                  type: string
-                  default: "pvc"
-                  hidden: true
-                  enum:
-                    - value: "pvc"
-                      description: "pvc"
-                    - value: "emptyDir"
-                      description: "emptyDir"
-                    - value: "hostPath"
-                      description: "hostPath"
-              - variable: storageClass
-                label: "(Advanced) storageClass"
-                description: " Warning: Anything other than SCALE-ZFS will break rollback!"
-                schema:
-                  show_if: [["type", "=", "pvc"]]
-                  type: string
-                  default: "SCALE-ZFS"
-              - variable: mountPath
-                label: "mountPath"
-                description: "Path inside the container the storage is mounted"
-                schema:
-                  type: string
-                  default: ""
-                  hidden: true
-              - variable: medium
-                label: "EmptyDir Medium"
-                schema:
-                  show_if: [["type", "=", "emptyDir"]]
-                  type: string
-                  default: ""
-                  enum:
-                    - value: ""
-                      description: "Default"
-                    - value: "Memory"
-                      description: "Memory"
-              - variable: accessMode
-                label: "Access Mode (Advanced)"
-                description: "Allow or disallow multiple PVC's writhing to the same PV"
-                schema:
-                  show_if: [["type", "=", "pvc"]]
-                  type: string
-                  default: "ReadWriteOnce"
-                  enum:
-                    - value: "ReadWriteOnce"
-                      description: "ReadWriteOnce"
-                    - value: "ReadOnlyMany"
-                      description: "ReadOnlyMany"
-                    - value: "ReadWriteMany"
-                      description: "ReadWriteMany"
-              - variable: size
-                label: "Size quotum of storage"
-                schema:
-                  show_if: [["type", "=", "pvc"]]
-                  type: string
-                  default: "100Gi"
         - variable: redismaster
           label: "Redis Storage"
           description: "Stores the Application redis-master-database."
diff --git a/charts/stable/nextcloud/values.yaml b/charts/stable/nextcloud/values.yaml
index 16e4ce67f79..72a1ad698e6 100644
--- a/charts/stable/nextcloud/values.yaml
+++ b/charts/stable/nextcloud/values.yaml
@@ -59,14 +59,6 @@ persistence:
     accessMode: ReadWriteOnce
     size: "100Gi"
 
-  db:
-    noMount: true
-    forceName: "db"
-    enabled: true
-    type: pvc
-    accessMode: ReadWriteOnce
-    size: "100Gi"
-
   redismaster:
     noMount: true
     forceName: "redismaster"
@@ -194,15 +186,11 @@ cronjob:
 # Enabled postgres
 # ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/postgresql
 postgresql:
-  volumePermissions:
-    enabled: true
   enabled: true
   postgresqlUsername: nextcloud
   postgresqlDatabase: nextcloud
   existingSecret: dbcreds
-  persistence:
-    enabled: false
-    existingClaim: db
+
 
 # Enabled redis
 # ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/redis