From 36208477014084734d76aa7a77f58efe3d5cce6a Mon Sep 17 00:00:00 2001
From: SeanOMik <seanomik@gmail.com>
Date: Thu, 23 May 2024 16:21:40 -0400
Subject: [PATCH] fix(fireflyiii): use app-template 3.1.0, fix issue with pvc

---
 .../apps/default/fireflyiii/helm-release.yaml | 57 +++++++++++--------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/cluster/apps/default/fireflyiii/helm-release.yaml b/cluster/apps/default/fireflyiii/helm-release.yaml
index eb607a2..f369f41 100644
--- a/cluster/apps/default/fireflyiii/helm-release.yaml
+++ b/cluster/apps/default/fireflyiii/helm-release.yaml
@@ -1,54 +1,63 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
-  name: firefly-iii
+  name: fireflyiii
   namespace: default
 spec:
   interval: 5m
   chart:
     spec:
       chart: app-template
-      version: 1.3.x
+      version: 3.1.0
       sourceRef:
         kind: HelmRepository
         name: bjws-charts
         namespace: flux-system
 
   values:
-    image:
-      repository: fireflyiii/core
-      tag: version-6.0.30
-    
-    envFrom:
-      - secretRef:
-          name: "firefly-env-secret"
+    controllers:
+      main:
+        pod:
+          securityContext:
+            runAsNonRoot: true
+            runAsUser: 10000
+            runAsGroup: 10000
+            fsGroup: 10000
+            fsGroupChangePolicy: OnRootMismatch
+
+        containers:
+          main:
+            image:
+              repository: fireflyiii/core
+              tag: version-6.0.30
 
     service:
-      main:
+      app:
+        controller: main
+
         ports:
           http:
             port: 8080
 
     ingress:
       main:
-        enabled: true
         annotations:
           cert-manager.io/cluster-issuer: letsencrypt-production
           traefik.ingress.kubernetes.io/router.entrypoints: websecure
           traefik.ingress.kubernetes.io/router.middlewares: traefik-authentik@kubernetescrd
+
         hosts:
-          - host: &host "budget.${SECRET_NEW_DOMAIN}"
-            paths:
-              - path: /
-                pathType: Prefix
-        tls:
-          - hosts:
-              - *host
-            
+        - host: "budget.${SECRET_NEW_DOMAIN}"
+          paths:
+          - path: /
+            service:
+              identifier: app
+              port: http
+
     persistence:
       firefly-uploads:
-        enabled: true
-        type: pvc
-        accessMode: ReadWriteOnce
-        size: 8Gi
-        mountPath: /var/www/html/storage/upload
\ No newline at end of file
+        type: hostPath
+        hostPath: /mnt/MainPool/Kubernetes/fireflyiii-uploads
+        globalMounts:
+        - path: /var/www/html/storage/upload