clusters/cl01tl/manifests/garage/Deployment-garage-main.yaml

@@ -54,6 +54,8 @@ spec:
               subPath: garage.toml
             - mountPath: /var/lib/garage/data
               name: data
+            - mountPath: /var/lib/garage/meta
+              name: db
             - mountPath: /var/lib/garage/snapshots
               name: snapshots
         - envFrom:
@@ -74,6 +76,8 @@ spec:
               subPath: garage.toml
             - mountPath: /var/lib/garage/data
               name: data
+            - mountPath: /var/lib/garage/meta
+              name: db
             - mountPath: /var/lib/garage/snapshots
               name: snapshots
       volumes:
@@ -83,6 +87,9 @@ spec:
         - name: data
           persistentVolumeClaim:
             claimName: garage-data
+        - name: db
+          persistentVolumeClaim:
+            claimName: garage-db
         - name: snapshots
           persistentVolumeClaim:
             claimName: garage-snapshots

clusters/cl01tl/manifests/garage/ExternalSecret-garage-db-backup-secret-remote.yaml

@@ -1,51 +0,0 @@
-apiVersion: external-secrets.io/v1
-kind: ExternalSecret
-metadata:
-  name: garage-db-backup-secret-remote
-  namespace: garage
-spec:
-  data:
-    - remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
-        key: /volsync/restic/garage-remote
-        metadataPolicy: None
-        property: BUCKET_ENDPOINT
-      secretKey: BUCKET_ENDPOINT
-    - remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
-        key: /volsync/restic/garage-remote
-        metadataPolicy: None
-        property: RESTIC_PASSWORD
-      secretKey: RESTIC_PASSWORD
-    - remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
-        key: /garage/home-infra/volsync-backups
-        metadataPolicy: None
-        property: ACCESS_REGION
-      secretKey: AWS_DEFAULT_REGION
-    - remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
-        key: /garage/home-infra/volsync-backups
-        metadataPolicy: None
-        property: ACCESS_KEY_ID
-      secretKey: AWS_ACCESS_KEY_ID
-    - remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
-        key: /garage/home-infra/volsync-backups
-        metadataPolicy: None
-        property: ACCESS_SECRET_KEY
-      secretKey: AWS_SECRET_ACCESS_KEY
-  secretStoreRef:
-    kind: ClusterSecretStore
-    name: vault
-  target:
-    template:
-      data:
-        RESTIC_REPOSITORY: "{{ .BUCKET_ENDPOINT }}/garage/garage-db"
-      engineVersion: v2
-      mergePolicy: Merge

clusters/cl01tl/manifests/garage/PersistentVolumeClaim-garage-db.yaml

@@ -1,12 +1,19 @@
-apiVersion: v1
 kind: PersistentVolumeClaim
+apiVersion: v1
 metadata:
   name: garage-db
+  labels:
+    app.kubernetes.io/instance: garage
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: garage
+    helm.sh/chart: garage-4.5.0
+  annotations:
+    helm.sh/resource-policy: keep
   namespace: garage
 spec:
   accessModes:
-    - ReadWriteOnce
+    - "ReadWriteOnce"
   resources:
     requests:
-      storage: 50Gi
+      storage: "50Gi"
-  storageClassName: ceph-block
+  storageClassName: "ceph-block"

clusters/cl01tl/manifests/garage/ReplicationDestination-garage-db.yaml

@@ -1,16 +0,0 @@
-apiVersion: volsync.backube/v1alpha1
-kind: ReplicationDestination
-metadata:
-  name: garage-db
-  namespace: garage
-  labels:
-    app.kubernetes.io/name: garage-db
-    app.kubernetes.io/instance: garage
-    app.kubernetes.io/part-of: garage
-spec:
-  trigger:
-    manual: restore-once
-  restic:
-    repository: garage-db-backup-secret-remote
-    destinationPVC: garage-db
-    copyMethod: Direct