From 1620db301000b1b59cdc6aaa556ac4501f051c83 Mon Sep 17 00:00:00 2001
From: JJGadgets <git@jjgadgets.tech>
Date: Fri, 3 May 2024 03:21:40 +0800
Subject: [PATCH] fix(ollama): separate models PVC backup data PVC

---
 kube/deploy/apps/ollama/app/hr.yaml  |  8 ++++++-
 kube/deploy/apps/ollama/app/pvc.yaml |  2 +-
 kube/deploy/apps/ollama/ks.yaml      | 32 +++++++++++++++++++++++++++-
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/kube/deploy/apps/ollama/app/hr.yaml b/kube/deploy/apps/ollama/app/hr.yaml
index 0d158c5c..125500d4 100644
--- a/kube/deploy/apps/ollama/app/hr.yaml
+++ b/kube/deploy/apps/ollama/app/hr.yaml
@@ -30,7 +30,7 @@ spec:
               tag: 0.1.32@sha256:c5018bf71b27a38f50da37d86fa0067105eea488cdcc258ace6d222dde632f75
             env:
               TZ: "${CONFIG_TZ}"
-              OLLAMA_MODELS: &pvc /data
+              OLLAMA_MODELS: &pvc /models
             securityContext: &sc
               readOnlyRootFilesystem: true
               allowPrivilegeEscalation: false
@@ -69,6 +69,12 @@ spec:
         existingClaim: ollama-data
         globalMounts:
           - subPath: data
+            path: /.ollama
+      models:
+        enabled: true
+        existingClaim: ollama-models
+        globalMounts:
+          - subPath: models
             path: *pvc
       tmp:
         enabled: true
diff --git a/kube/deploy/apps/ollama/app/pvc.yaml b/kube/deploy/apps/ollama/app/pvc.yaml
index 2605c782..e68e6c56 100644
--- a/kube/deploy/apps/ollama/app/pvc.yaml
+++ b/kube/deploy/apps/ollama/app/pvc.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: "ollama-data"
+  name: "ollama-models"
   labels:
     snapshot.home.arpa/enabled: "true"
     kustomize.toolkit.fluxcd.io/prune: "Disabled"
diff --git a/kube/deploy/apps/ollama/ks.yaml b/kube/deploy/apps/ollama/ks.yaml
index 86d225de..bf0e9dcf 100644
--- a/kube/deploy/apps/ollama/ks.yaml
+++ b/kube/deploy/apps/ollama/ks.yaml
@@ -11,4 +11,34 @@ spec:
     labels: *l
   path: ./kube/deploy/apps/ollama/app
   targetNamespace: "ollama"
-  dependsOn: []
+  dependsOn:
+    - name: ollama-pvc
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: ollama-pvc
+  namespace: flux-system
+  labels: &l
+    app.kubernetes.io/name: "ollama"
+spec:
+  commonMetadata:
+    labels: *l
+  path: ./kube/deploy/core/storage/volsync/template
+  targetNamespace: "ollama"
+  dependsOn:
+    - name: 1-core-storage-volsync-app
+    - name: 1-core-storage-rook-ceph-cluster
+  postBuild:
+    substitute:
+      PVC: "ollama-data"
+      SIZE: "10Gi"
+      SC: &sc "file"
+      SNAP: *sc
+      ACCESSMODE: "ReadWriteMany"
+      RUID: !!str &uid |
+        ${APP_UID_OLLAMA}
+      RGID: !!str |
+        ${APP_UID_OLLAMA}
+      RFSG: !!str |
+        ${APP_UID_OLLAMA}