diff --git a/charts/incubator/fireflyiii/Chart.yaml b/charts/incubator/fireflyiii/Chart.yaml index 3aaf1474796..048c0c1d17d 100644 --- a/charts/incubator/fireflyiii/Chart.yaml +++ b/charts/incubator/fireflyiii/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 deprecated: false description: A free and open source personal finance manager home: https://github.com/firefly-iii/firefly-iii/ @@ -27,4 +27,4 @@ name: fireflyiii sources: - https://github.com/firefly-iii/firefly-iii/ type: application -version: 4.11.0 +version: 5.0.0 diff --git a/charts/incubator/fireflyiii/SCALE/ix_values.yaml b/charts/incubator/fireflyiii/SCALE/ix_values.yaml index a8ea761002b..374c27085b4 100644 --- a/charts/incubator/fireflyiii/SCALE/ix_values.yaml +++ b/charts/incubator/fireflyiii/SCALE/ix_values.yaml @@ -36,15 +36,12 @@ envValueFrom: key: postgresql-password # Enabled postgres -# ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/postgresql postgresql: enabled: true postgresqlUsername: fireflyiii postgresqlDatabase: fireflyiii existingSecret: dbcreds - persistence: - enabled: true - existingClaim: db + ## # Most other defaults are set in questions.yaml # For other options please refer to the wiki, default_values.yaml or the common library chart diff --git a/charts/incubator/fireflyiii/SCALE/questions.yaml b/charts/incubator/fireflyiii/SCALE/questions.yaml index 854b3efa0b7..713ea5c4c0d 100644 --- a/charts/incubator/fireflyiii/SCALE/questions.yaml +++ b/charts/incubator/fireflyiii/SCALE/questions.yaml @@ -364,194 +364,7 @@ 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: 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: dbbackup - label: "Database Backup Storage" - description: "Stores the Application database backups." - schema: - type: dict - attrs: - - variable: enabled - label: "Enable the storage" - schema: - type: boolean - default: true - - variable: type - label: "(Advanced) Type of Storage" - description: "Sets the persistence type" - schema: - type: string - default: "pvc" - 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: setPermissions - label: "Automatic Permissions" - description: "Automatically set permissions on install" - schema: - show_if: [["type", "=", "hostPath"]] - type: boolean - default: true - - variable: readOnly - label: "readOnly" - schema: - type: boolean - default: false - - variable: hostPath - label: "hostPath" - description: "Path inside the container the storage is mounted" - schema: - show_if: [["type", "=", "hostPath"]] - type: hostpath - - variable: hostPathType - label: "hostPath Type" - schema: - show_if: [["type", "=", "hostPath"]] - type: string - default: "" - enum: - - value: "" - description: "Default" - - value: "DirectoryOrCreate" - description: "DirectoryOrCreate" - - value: "Directory" - description: "Directory" - - value: "FileOrCreate" - description: "FileOrCreate" - - value: "File" - description: "File" - - value: "Socket" - description: "Socket" - - value: "CharDevice" - description: "CharDevice" - - value: "BlockDevice" - description: "BlockDevice" - - 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: persistenceList label: "Additional app storage" group: "Storage and Persistence" diff --git a/charts/incubator/fireflyiii/values.yaml b/charts/incubator/fireflyiii/values.yaml index d05a4af4796..d090d2768bd 100644 --- a/charts/incubator/fireflyiii/values.yaml +++ b/charts/incubator/fireflyiii/values.yaml @@ -61,22 +61,10 @@ persistence: mountPath: "/var/www/html/storage/upload" type: emptyDir - db: - forceName: "db" - enabled: true - type: emptyDir - - dbbackup: - enabled: true - type: emptyDir # Enabled postgres -# ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/postgresql postgresql: enabled: true postgresqlUsername: firefly postgresqlDatabase: firefly existingSecret: dbcreds - persistence: - enabled: false - existingClaim: db