apps/gitea/kustomization.yaml

@@ -10,8 +10,6 @@ resources:
 - restic-sa.yaml
 - restic-role.yaml
 - restic-role-binding.yaml
-- restic-pvc.yaml
-- restic-debug-pod.yaml
 - restic-cronjob.yaml
 
 

apps/gitea/restic-backup.sh

@@ -11,7 +11,7 @@ echo -e "\n${GREEN}`date` - Backing up Gitea...${NC}\n"
 gitea=$(kubectl get deploy -n gitea -l app=gitea -o name --no-headers=true)
 kubectl scale -n gitea --replicas=0 $gitea
 restic backup /gitea
-restic backup /backup/postgres_backup.dump
+restic backup /pg_backup/postgres_backup.dump
 kubectl scale -n gitea --replicas=1 $gitea
 
 # Forget and prune

apps/gitea/restic-cronjob.yaml

@@ -16,9 +16,11 @@ spec:
           - name: gitea-data
             persistentVolumeClaim:
               claimName: gitea-shared-storage
-          - name: restic-backup-vol
+          - name: postgres-data
             persistentVolumeClaim:
-              claimName: restic-backup-vol
+              claimName: data-gitea-postgresql-0
+          - name: postgres-backup-vol
+            emptyDir: {}
           - name: backup-script-vol
             configMap:
               name: restic-backup-script
@@ -27,7 +29,7 @@ spec:
           - name: postgres-dump-init
             image: bitnami/postgresql:15.3.0-debian-11-r24
             command: ["/bin/sh", "-c"]
-            args: ["pg_dump -h gitea-postgresql -p 5432 -U gitea gitea -Fc > /backup/postgres_backup.dump"]
+            args: ["pg_dump -h gitea-postgresql -p 5432 -U gitea gitea -Fc > /pg_backup/postgres_backup.dump"]
             env:
             - name: PGPASSWORD
               valueFrom:
@@ -35,8 +37,10 @@ spec:
                   name: gitea-postgresql
                   key: postgres-password
             volumeMounts:
-            - name: restic-backup-vol
-              mountPath: /backup
+            - name: postgres-backup-vol
+              mountPath: /pg_backup
+            - name: postgres-data
+              mountPath: /bitnami/postgresql/data
 
           containers:
           - name: restic-container
@@ -47,8 +51,8 @@ spec:
             - secretRef:
                 name: restic-secret
             volumeMounts:
-            - name: restic-backup-vol
-              mountPath: /backup
+            - name: postgres-backup-vol
+              mountPath: /pg_backup
             - name: gitea-data
               mountPath: /gitea
             - name: backup-script-vol

apps/gitea/restic-debug-pod.yaml

@@ -1,28 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: restic-debug-pod
-  namespace: gitea
-spec:
-  serviceAccountName: restic-sa
-  volumes:
-  - name: restic-backup-vol
-    persistentVolumeClaim:
-      claimName: restic-backup-vol
-  - name: gitea-data
-    persistentVolumeClaim:
-      claimName: gitea-shared-storage
-  containers:
-  - name: restic-debug
-    image: git.namesny.com/cluster/restic:latest
-    command: ["/bin/sh", "-c"]
-    args: ["sleep infinity"]
-    envFrom:
-    - secretRef:
-        name: restic-secret
-    volumeMounts:
-    - name: restic-backup-vol
-      mountPath: /backup
-    - name: gitea-data
-      mountPath: /gitea
-

apps/gitea/restic-pvc.yaml

@@ -1,12 +0,0 @@
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: restic-backup-vol
-  namespace: gitea
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 5Gi
-  storageClassName: retain-local-path