From ad5fbfd173ce5957a061310803ad6133dccd119c Mon Sep 17 00:00:00 2001
From: Mirco <mirco.zachmann@meissa.de>
Date: Fri, 20 Sep 2024 12:12:28 +0200
Subject: [PATCH 1/2] [skip ci] update to 8.0.3; backup&restore cmd's use bb
 now

---
 doc/BackupAndRestore.md                    | 22 +++++++++++-----------
 src/main/cljc/dda/c4k_forgejo/forgejo.cljc |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/doc/BackupAndRestore.md b/doc/BackupAndRestore.md
index b878126..50b9658 100644
--- a/doc/BackupAndRestore.md
+++ b/doc/BackupAndRestore.md
@@ -10,32 +10,32 @@
 ## Manual init the restic repository for the first time
 
 1. apply backup-and-restore pod:   
-   `kubectl scale deployment backup-restore --replicas=1`
+   `kubectl -n forgejo scale deployment backup-restore --replicas=1`
 2. exec into pod and execute restore pod (press tab to get your exact pod name)   
-   `kubectl exec -it backup-restore-... -- /usr/local/bin/init.sh`
+   `kubectl -n forgejo exec -it backup-restore-... -- /usr/local/bin/init.bb`
 3. remove backup-and-restore pod:   
-   `kubectl scale deployment backup-restore --replicas=0`
+   `kubectl -n forgejo scale deployment backup-restore --replicas=0`
 
 
 ## Manual backup the restic repository for the first time
 
 1. apply backup-and-restore pod:   
-  `kubectl scale deployment backup-restore --replicas=1`
+  `kubectl -n forgejo scale deployment backup-restore --replicas=1`
 2. exec into pod and execute backup pod (press tab to get your exact pod name)   
-   `kubectl exec -it backup-restore-... -- /usr/local/bin/backup.sh`
+   `kubectl -n forgejo exec -it backup-restore-... -- /usr/local/bin/backup.bb`
 3. remove backup-and-restore pod:   
-   `kubectl scale deployment backup-restore --replicas=0`
+   `kubectl -n forgejo scale deployment backup-restore --replicas=0`
 
 
 ## Manual restore
 
 1. apply backup-and-restore pod:   
-  `kubectl scale deployment backup-restore --replicas=1`
+  `kubectl -n forgejo scale deployment backup-restore --replicas=1`
 2. Scale down forgejo deployment:
-   `kubectl scale deployment forgejo --replicas=0`
+   `kubectl -n forgejo scale deployment forgejo --replicas=0`
 3. exec into pod and execute restore pod (press tab to get your exact pod name)   
-   `kubectl exec -it backup-restore-... -- /usr/local/bin/restore.sh`
+   `kubectl -n forgejo exec -it backup-restore-... -- /usr/local/bin/restore.bb`
 4. Start forgejo again:
-   `kubectl scale deployment forgejo --replicas=1`
+   `kubectl -n forgejo scale deployment forgejo --replicas=1`
 5. remove backup-and-restore pod:   
-   `kubectl scale deployment backup-restore --replicas=0`
+   `kubectl -n forgejo scale deployment backup-restore --replicas=0`
diff --git a/src/main/cljc/dda/c4k_forgejo/forgejo.cljc b/src/main/cljc/dda/c4k_forgejo/forgejo.cljc
index 0766a02..8e56b35 100644
--- a/src/main/cljc/dda/c4k_forgejo/forgejo.cljc
+++ b/src/main/cljc/dda/c4k_forgejo/forgejo.cljc
@@ -69,11 +69,11 @@
 (defn data-storage-by-volume-size
   [total]
   total)
-
+;;TODO: remove unneccessaries, fedaration is merged
 (def federated-image-name "domaindrivenarchitecture/c4k-forgejo-federated")
 (def federated-image-version "latest")
 (def non-federated-image-name "codeberg.org/forgejo/forgejo")
-(def non-federated-image-version "8.0")
+(def non-federated-image-version "8.0.3")
 
 (defn-spec generate-image-str string?
   [config config?]

From 9fefac08680e67c5439e67a496fc44153efe0711 Mon Sep 17 00:00:00 2001
From: Mirco <mirco.zachmann@meissa.de>
Date: Fri, 20 Sep 2024 13:41:08 +0200
Subject: [PATCH 2/2] [skip ci] fix test

---
 src/test/cljc/dda/c4k_forgejo/forgejo_test.cljc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/cljc/dda/c4k_forgejo/forgejo_test.cljc b/src/test/cljc/dda/c4k_forgejo/forgejo_test.cljc
index 25d64cd..a7c03b6 100644
--- a/src/test/cljc/dda/c4k_forgejo/forgejo_test.cljc
+++ b/src/test/cljc/dda/c4k_forgejo/forgejo_test.cljc
@@ -14,7 +14,7 @@
 
 (deftest should-generate-image-str
   (testing "non-federated-image"
-    (is (= "codeberg.org/forgejo/forgejo:8.0"
+    (is (= "codeberg.org/forgejo/forgejo:8.0.3"
            (cut/generate-image-str {:fqdn "test.de"
                                     :mailer-from ""
                                     :mailer-host "m.t.de"
@@ -97,7 +97,7 @@
               :spec
               {:containers
                [{:name "forgejo",
-                 :image "codeberg.org/forgejo/forgejo:8.0",
+                 :image "codeberg.org/forgejo/forgejo:8.0.3",
                  :imagePullPolicy "IfNotPresent",
                  :envFrom [{:configMapRef {:name "forgejo-env"}} {:secretRef {:name "forgejo-secrets"}}],
                  :volumeMounts [{:name "forgejo-data-volume", :mountPath "/data"}],