From 76586e04b6073d4d4653b1b0bca01de93b45f560 Mon Sep 17 00:00:00 2001
From: Edward Cheng <edward@cheng.sydney>
Date: Mon, 8 Jul 2024 07:13:59 +1000
Subject: [PATCH] fix pvcs for mongodb

---
 .../infrastructure/mongodb/app/release.yaml   | 20 ++++++++++--
 .../infrastructure/mongodb/app/volume.yaml    | 32 -------------------
 2 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/kubernetes/infrastructure/mongodb/app/release.yaml b/kubernetes/infrastructure/mongodb/app/release.yaml
index 390df64..21173ff 100644
--- a/kubernetes/infrastructure/mongodb/app/release.yaml
+++ b/kubernetes/infrastructure/mongodb/app/release.yaml
@@ -43,7 +43,18 @@ spec:
       autoDiscovery:
         enabled: true
     persistence:
-      existingClaim: "mongodb-pvc"
+      name: "mongodb-pvc"
+      resourcePolicy: "keep"
+      storageClass: "local-path"
+      size: "32Gi"
+      labels:
+        name: mongodb-pvc
+      volumeClaimTemplates:
+        selector:
+          matchLabels:
+            name: mongodb-pv
+    persistentVolumeClaimRetentionPolicy:
+      enabled: true
     backup:
       enabled: true
       cronjob:
@@ -52,7 +63,12 @@ spec:
           runAsUser: 1000
           runAsGroup: 1000
         storage:
-          existingClaim: "mongodb-backup-pvc"
+          resourcePolicy: "keep"
+          storageClass: "local-path"
+          volumeClaimTemplates:
+            selector:
+              matchLabels:
+                name: mongodb-backup-pv
     serviceAccount:
       create: true
       name: mongodb
diff --git a/kubernetes/infrastructure/mongodb/app/volume.yaml b/kubernetes/infrastructure/mongodb/app/volume.yaml
index 4923a9c..5080685 100644
--- a/kubernetes/infrastructure/mongodb/app/volume.yaml
+++ b/kubernetes/infrastructure/mongodb/app/volume.yaml
@@ -30,22 +30,6 @@ spec:
                 - rpi5-cluster-node-1
 ---
 apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: mongodb-pvc
-  namespace: mongodb
-  labels:
-    name: mongodb-pvc
-spec:
-  storageClassName: local-path
-  volumeMode: Filesystem
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 32Gi
----
-apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: mongodb-backup-pv
@@ -75,19 +59,3 @@ spec:
               operator: In
               values:
                 - rpi5-cluster-node-1
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: mongodb-backup-pvc
-  namespace: mongodb
-  labels:
-    name: mongodb-backup-pvc
-spec:
-  storageClassName: local-path
-  volumeMode: Filesystem
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 8Gi