Use existingClaim for rocketchat PVCs

.pre-commit-config.yaml

@@ -6,6 +6,8 @@ repos:
       - id: check-ast
       - id: check-merge-conflict
       - id: check-yaml
+        args:
+          - --allow-multiple-documents
       - id: detect-private-key
       - id: end-of-file-fixer
       - id: trailing-whitespace

flux2/apps/rocketchat/kustomization.yaml

@@ -2,5 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: oas-apps
 resources:
+  - pvc.yaml
   - release.yaml
   - rocketchat-values-configmap.yaml

flux2/apps/rocketchat/pvc.yaml

+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: rocketchat-data
+  labels:
+    openappstack.net/backupSet: "rocketchat"
+spec:
+  accessModes:
+    - ReadWriteOnce
+  volumeMode: Filesystem
+  resources:
+    requests:
+      storage: 1Gi
+  storageClassName: local-path
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: rocketchat-mongodb
+  labels:
+    openappstack.net/backupSet: "rocketchat"
+spec:
+  accessModes:
+    - ReadWriteOnce
+  volumeMode: Filesystem
+  resources:
+    requests:
+      storage: 1Gi
+  storageClassName: local-path

flux2/apps/rocketchat/rocketchat-values-configmap.yaml

@@ -88,10 +88,7 @@ data:
 
     persistence:
       enabled: true
-      size: 1Gi
-      # FIXME: This valuee leads to an unused PVC, which helm-controller does
-      # not like.
-      # existingClaim: "rocketchat-data"
+      existingClaim: "rocketchat-data"
 
     podAnnotations:
       # Let the backup system include rocketchat data.
@@ -114,8 +111,7 @@ data:
         backup.velero.io/backup-volumes: "datadir"
       persistence:
         enabled: true
-        # FIXME: This value is ignored by the chart currently in use
-        # existingClaim: "rocketchat-mongodb"
+        existingClaim: "rocketchat-mongodb"
       resources:
         limits:
           cpu: 600m