From ecca694f4cd48a3751445f61e2ae83f6bd14e2f0 Mon Sep 17 00:00:00 2001
From: jerger <michael.jerger@meissa-gmbh.de>
Date: Sat, 19 Mar 2022 17:15:55 +0100
Subject: [PATCH] proceed to nextcloud20

---
 doc/BackupAndRestore.md                        | 18 ++++++++----------
 .../docker-nextcloud/image/Dockerfile          |  2 +-
 .../backup/backup-restore-deployment.yaml      |  6 ------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/doc/BackupAndRestore.md b/doc/BackupAndRestore.md
index d1367ef..adff4fe 100644
--- a/doc/BackupAndRestore.md
+++ b/doc/BackupAndRestore.md
@@ -9,8 +9,6 @@
 
 ## Manual init the restic repository for the first time
 
-1. apply backup-and-restore pod:   
-   `kubectl apply -f src/main/resources/backup/backup-restore-deployment.yaml`
 1. Scale backup-restore deployment up:   
    `kubectl scale deployment backup-restore --replicas=1`
 1. exec into pod and execute restore pod   
@@ -24,12 +22,12 @@
 
 1. Scale Cloud deployment down:   
   `kubectl scale deployment cloud --replicas=0`
-1. apply backup-and-restore pod:   
-  `kubectl apply -f src/main/resources/backup/backup-restore-deployment.yaml`
+1. Scale backup-restore deployment up:   
+   `kubectl scale deployment backup-restore --replicas=1`
 1. exec into pod and execute restore pod   
    `kubectl exec -it backup-restore -- /usr/local/bin/backup.sh`
-1. remove backup-and-restore pod:   
-   `kubectl delete pod backup-restore`
+1. Scale backup-restore deployment down:   
+  `kubectl scale deployment backup-restore --replicas=0`
 1. Scale Cloud deployment up:   
    `kubectl scale deployment cloud --replicas=1`
 
@@ -38,13 +36,13 @@
 
 1. Scale Cloud deployment down:   
   `kubectl scale deployment cloud --replicas=0`
+1. Scale backup-restore deployment up:   
+   `kubectl scale deployment backup-restore --replicas=1`
 1. apply backup-and-restore pod:   
   `kubectl apply -f src/main/resources/backup/backup-restore-deployment.yaml`
 1. exec into pod and execute restore pod   
    `kubectl exec -it backup-restore -- /usr/local/bin/restore.sh`
-1. remove backup-and-restore pod:   
-   `kubectl delete pod backup-restore`
+1. Scale backup-restore deployment down:   
+  `kubectl scale deployment backup-restore --replicas=0`
 1. Scale Cloud deployment up:   
    `kubectl scale deployment cloud --replicas=1`
-1. Update index of Cloud:   
-   Cloud > Settings > System > Advanced > Indexing
diff --git a/infrastructure/docker-nextcloud/image/Dockerfile b/infrastructure/docker-nextcloud/image/Dockerfile
index 8b3d9e9..bea82e1 100644
--- a/infrastructure/docker-nextcloud/image/Dockerfile
+++ b/infrastructure/docker-nextcloud/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM nextcloud:19
+FROM nextcloud:20
 
 # Prepare Entrypoint Script
 ADD resources /tmp
diff --git a/src/main/resources/backup/backup-restore-deployment.yaml b/src/main/resources/backup/backup-restore-deployment.yaml
index 85787f6..ffe9951 100644
--- a/src/main/resources/backup/backup-restore-deployment.yaml
+++ b/src/main/resources/backup/backup-restore-deployment.yaml
@@ -67,9 +67,6 @@ spec:
         - name: cloud-secret-volume
           mountPath: /var/run/secrets/cloud-secrets
           readOnly: true
-        - name: localstack-secret-volume
-          mountPath: /var/run/secrets/localstack-secrets
-          readOnly: true
       volumes:
       - name: cloud-data-volume
         persistentVolumeClaim:
@@ -80,6 +77,3 @@ spec:
       - name: backup-secret-volume
         secret:
           secretName: backup-secret
-      - name: localstack-secret-volume
-        secret:
-          secretName: localstack-secret
\ No newline at end of file