From c2574c481feefa487c704f68885deb3fe20f4009 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 15 Mar 2024 13:03:53 +0100 Subject: [PATCH 01/28] Actually create the uberjar --- build.py | 1 + 1 file changed, 1 insertion(+) diff --git a/build.py b/build.py index f4e996d..28d65b4 100644 --- a/build.py +++ b/build.py @@ -97,6 +97,7 @@ def package_frontend(project): @task def package_uberjar(project): + run("lein uberjar", shell=True, check=True) run( "sha256sum target/uberjar/c4k-nextcloud-standalone.jar > target/uberjar/c4k-nextcloud-standalone.jar.sha256", shell=True, From 2119a8b0376d6d4989d3001fce5b88327187c20e Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 15 Mar 2024 14:12:12 +0100 Subject: [PATCH 02/28] Update image version in test --- src/test/cljc/dda/c4k_nextcloud/nextcloud_test.cljc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/cljc/dda/c4k_nextcloud/nextcloud_test.cljc b/src/test/cljc/dda/c4k_nextcloud/nextcloud_test.cljc index a266426..8919c24 100644 --- a/src/test/cljc/dda/c4k_nextcloud/nextcloud_test.cljc +++ b/src/test/cljc/dda/c4k_nextcloud/nextcloud_test.cljc @@ -94,7 +94,7 @@ {:metadata {:labels {:app "cloud-app", :app.kubernetes.io/name "cloud-pod", :app.kubernetes.io/application "cloud", :redeploy "v3"}} :spec {:containers - [{:image "domaindrivenarchitecture/c4k-cloud:7.0.0" + [{:image "domaindrivenarchitecture/c4k-cloud:8.0.0" :name "cloud-app" :imagePullPolicy "IfNotPresent" :ports [{:containerPort 80}] From f765b17dadc901ee3ac8a99f511b163473265496 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 15 Mar 2024 14:14:11 +0100 Subject: [PATCH 03/28] Bump dependencies --- project.clj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/project.clj b/project.clj index 7c772fa..b4eabe2 100644 --- a/project.clj +++ b/project.clj @@ -3,9 +3,9 @@ :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" :url "https://www.apache.org/licenses/LICENSE-2.0.html"} - :dependencies [[org.clojure/clojure "1.11.1"] - [org.clojure/tools.reader "1.4.0"] - [org.domaindrivenarchitecture/c4k-common-clj "6.1.3"] + :dependencies [[org.clojure/clojure "1.11.2"] + [org.clojure/tools.reader "1.4.1"] + [org.domaindrivenarchitecture/c4k-common-clj "6.2.2"] [hickory "0.7.1" :exclusions [viebel/codox-klipse-theme]]] :target-path "target/%s/" :source-paths ["src/main/cljc" @@ -23,7 +23,7 @@ :main dda.c4k-nextcloud.uberjar :uberjar-name "c4k-nextcloud-standalone.jar" :dependencies [[org.clojure/tools.cli "1.1.230"] - [ch.qos.logback/logback-classic "1.5.0" + [ch.qos.logback/logback-classic "1.5.3" :exclusions [com.sun.mail/javax.mail]] [org.slf4j/jcl-over-slf4j "2.0.12"] [com.github.clj-easy/graal-build-time "1.0.5"]]}} From 17ffd5a10e96e57cf2dfe9e4054ffa39c6e82836 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 15 Mar 2024 14:14:52 +0100 Subject: [PATCH 04/28] release: 8.0.1 --- infrastructure/backup/build.py | 2 +- infrastructure/nextcloud/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure/backup/build.py b/infrastructure/backup/build.py index d3a3fdb..7c5f0f2 100644 --- a/infrastructure/backup/build.py +++ b/infrastructure/backup/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-cloud" MODULE = "backup" PROJECT_ROOT_PATH = "../.." -version = "8.0.1-dev" +version = "8.0.1" @init diff --git a/infrastructure/nextcloud/build.py b/infrastructure/nextcloud/build.py index aa0bfc1..dbd641b 100644 --- a/infrastructure/nextcloud/build.py +++ b/infrastructure/nextcloud/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = 'c4k-cloud' MODULE = 'not_set' PROJECT_ROOT_PATH = '../..' -version = "8.0.1-dev" +version = "8.0.1" @init def initialize(project): diff --git a/package.json b/package.json index ea95b51..038f8aa 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-nextcloud", "description": "Generate c4k yaml for a nextcloud deployment.", "author": "meissa GmbH", - "version": "8.0.1-SNAPSHOT", + "version": "8.0.1", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud#readme", "repository": "https://www.npmjs.com/package/c4k-nextcloud", "license": "APACHE2", diff --git a/project.clj b/project.clj index b4eabe2..1caf8aa 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.1-SNAPSHOT" +(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.1" :description "nextcloud c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From fa81908791180d700caa4e2bd26bb05b4f16ea67 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 15 Mar 2024 14:14:52 +0100 Subject: [PATCH 05/28] bump version to: 8.0.2-SNAPSHOT --- infrastructure/backup/build.py | 2 +- infrastructure/nextcloud/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure/backup/build.py b/infrastructure/backup/build.py index 7c5f0f2..42a8bd3 100644 --- a/infrastructure/backup/build.py +++ b/infrastructure/backup/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-cloud" MODULE = "backup" PROJECT_ROOT_PATH = "../.." -version = "8.0.1" +version = "8.0.2-dev" @init diff --git a/infrastructure/nextcloud/build.py b/infrastructure/nextcloud/build.py index dbd641b..cd378a0 100644 --- a/infrastructure/nextcloud/build.py +++ b/infrastructure/nextcloud/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = 'c4k-cloud' MODULE = 'not_set' PROJECT_ROOT_PATH = '../..' -version = "8.0.1" +version = "8.0.2-dev" @init def initialize(project): diff --git a/package.json b/package.json index 038f8aa..1e1c38c 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-nextcloud", "description": "Generate c4k yaml for a nextcloud deployment.", "author": "meissa GmbH", - "version": "8.0.1", + "version": "8.0.2-SNAPSHOT", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud#readme", "repository": "https://www.npmjs.com/package/c4k-nextcloud", "license": "APACHE2", diff --git a/project.clj b/project.clj index 1caf8aa..fa01f65 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.1" +(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.2-SNAPSHOT" :description "nextcloud c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From 5f38fb7526d82a2a272df5fd9b7cc4d0e0381914 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 15 Mar 2024 14:26:55 +0100 Subject: [PATCH 06/28] Adapt core to changes in c4k-common --- src/main/cljc/dda/c4k_nextcloud/core.cljc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/cljc/dda/c4k_nextcloud/core.cljc b/src/main/cljc/dda/c4k_nextcloud/core.cljc index 897f9eb..4331754 100644 --- a/src/main/cljc/dda/c4k_nextcloud/core.cljc +++ b/src/main/cljc/dda/c4k_nextcloud/core.cljc @@ -23,13 +23,11 @@ (filter #(not (nil? %)) (cm/concat-vec - [(postgres/generate-config {:postgres-size :8gb :db-name "nextcloud"}) - (postgres/generate-secret auth) - (postgres/generate-pvc {:pv-storage-size-gb 50 - :pvc-storage-class-name default-storage-class}) - (postgres/generate-deployment) - (postgres/generate-service) - (nextcloud/generate-secret auth) + (postgres/generate {:postgres-size :8gb + :db-name "nextcloud" + :pv-storage-size-gb 50 + :pvc-storage-class-name default-storage-class}) + [(nextcloud/generate-secret auth) (nextcloud/generate-pvc (merge nextcloud-default-storage-config config)) (nextcloud/generate-deployment config) (nextcloud/generate-service)] From 3b458b980b51e1ce047510c75c86cc3da1db94b5 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 15 Mar 2024 14:27:40 +0100 Subject: [PATCH 07/28] release: 8.0.2 --- infrastructure/backup/build.py | 2 +- infrastructure/nextcloud/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure/backup/build.py b/infrastructure/backup/build.py index 42a8bd3..e15eb14 100644 --- a/infrastructure/backup/build.py +++ b/infrastructure/backup/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-cloud" MODULE = "backup" PROJECT_ROOT_PATH = "../.." -version = "8.0.2-dev" +version = "8.0.2" @init diff --git a/infrastructure/nextcloud/build.py b/infrastructure/nextcloud/build.py index cd378a0..01961e1 100644 --- a/infrastructure/nextcloud/build.py +++ b/infrastructure/nextcloud/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = 'c4k-cloud' MODULE = 'not_set' PROJECT_ROOT_PATH = '../..' -version = "8.0.2-dev" +version = "8.0.2" @init def initialize(project): diff --git a/package.json b/package.json index 1e1c38c..dccbbb4 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-nextcloud", "description": "Generate c4k yaml for a nextcloud deployment.", "author": "meissa GmbH", - "version": "8.0.2-SNAPSHOT", + "version": "8.0.2", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud#readme", "repository": "https://www.npmjs.com/package/c4k-nextcloud", "license": "APACHE2", diff --git a/project.clj b/project.clj index fa01f65..c0a848c 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.2-SNAPSHOT" +(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.2" :description "nextcloud c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From 3a9694d9a1270f56c601fea629b4fdd189ceca20 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 15 Mar 2024 14:27:40 +0100 Subject: [PATCH 08/28] bump version to: 8.0.3-SNAPSHOT --- infrastructure/backup/build.py | 2 +- infrastructure/nextcloud/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure/backup/build.py b/infrastructure/backup/build.py index e15eb14..2b1c0cd 100644 --- a/infrastructure/backup/build.py +++ b/infrastructure/backup/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-cloud" MODULE = "backup" PROJECT_ROOT_PATH = "../.." -version = "8.0.2" +version = "8.0.3-dev" @init diff --git a/infrastructure/nextcloud/build.py b/infrastructure/nextcloud/build.py index 01961e1..78d009e 100644 --- a/infrastructure/nextcloud/build.py +++ b/infrastructure/nextcloud/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = 'c4k-cloud' MODULE = 'not_set' PROJECT_ROOT_PATH = '../..' -version = "8.0.2" +version = "8.0.3-dev" @init def initialize(project): diff --git a/package.json b/package.json index dccbbb4..b2dac3d 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-nextcloud", "description": "Generate c4k yaml for a nextcloud deployment.", "author": "meissa GmbH", - "version": "8.0.2", + "version": "8.0.3-SNAPSHOT", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud#readme", "repository": "https://www.npmjs.com/package/c4k-nextcloud", "license": "APACHE2", diff --git a/project.clj b/project.clj index c0a848c..46a4c5c 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.2" +(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.3-SNAPSHOT" :description "nextcloud c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From 351b2295e3deb0594f77bf2de18747f0345a568c Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 15 Mar 2024 14:29:06 +0100 Subject: [PATCH 09/28] Add auth to postgres generate --- src/main/cljc/dda/c4k_nextcloud/core.cljc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/cljc/dda/c4k_nextcloud/core.cljc b/src/main/cljc/dda/c4k_nextcloud/core.cljc index 4331754..95ead37 100644 --- a/src/main/cljc/dda/c4k_nextcloud/core.cljc +++ b/src/main/cljc/dda/c4k_nextcloud/core.cljc @@ -26,7 +26,8 @@ (postgres/generate {:postgres-size :8gb :db-name "nextcloud" :pv-storage-size-gb 50 - :pvc-storage-class-name default-storage-class}) + :pvc-storage-class-name default-storage-class} + auth) [(nextcloud/generate-secret auth) (nextcloud/generate-pvc (merge nextcloud-default-storage-config config)) (nextcloud/generate-deployment config) From 9b13b96ff66c1e6883478cb0ee4c47a62e8bc710 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 15 Mar 2024 14:29:49 +0100 Subject: [PATCH 10/28] release: 8.0.3 --- infrastructure/backup/build.py | 2 +- infrastructure/nextcloud/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure/backup/build.py b/infrastructure/backup/build.py index 2b1c0cd..d95faeb 100644 --- a/infrastructure/backup/build.py +++ b/infrastructure/backup/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-cloud" MODULE = "backup" PROJECT_ROOT_PATH = "../.." -version = "8.0.3-dev" +version = "8.0.3" @init diff --git a/infrastructure/nextcloud/build.py b/infrastructure/nextcloud/build.py index 78d009e..cff5f5b 100644 --- a/infrastructure/nextcloud/build.py +++ b/infrastructure/nextcloud/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = 'c4k-cloud' MODULE = 'not_set' PROJECT_ROOT_PATH = '../..' -version = "8.0.3-dev" +version = "8.0.3" @init def initialize(project): diff --git a/package.json b/package.json index b2dac3d..30ead58 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-nextcloud", "description": "Generate c4k yaml for a nextcloud deployment.", "author": "meissa GmbH", - "version": "8.0.3-SNAPSHOT", + "version": "8.0.3", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud#readme", "repository": "https://www.npmjs.com/package/c4k-nextcloud", "license": "APACHE2", diff --git a/project.clj b/project.clj index 46a4c5c..7a623f4 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.3-SNAPSHOT" +(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.3" :description "nextcloud c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From 7219533c869e58288d26be0d6343964bce829163 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 15 Mar 2024 14:29:49 +0100 Subject: [PATCH 11/28] bump version to: 8.0.4-SNAPSHOT --- infrastructure/backup/build.py | 2 +- infrastructure/nextcloud/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure/backup/build.py b/infrastructure/backup/build.py index d95faeb..ccc2683 100644 --- a/infrastructure/backup/build.py +++ b/infrastructure/backup/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-cloud" MODULE = "backup" PROJECT_ROOT_PATH = "../.." -version = "8.0.3" +version = "8.0.4-dev" @init diff --git a/infrastructure/nextcloud/build.py b/infrastructure/nextcloud/build.py index cff5f5b..3527dad 100644 --- a/infrastructure/nextcloud/build.py +++ b/infrastructure/nextcloud/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = 'c4k-cloud' MODULE = 'not_set' PROJECT_ROOT_PATH = '../..' -version = "8.0.3" +version = "8.0.4-dev" @init def initialize(project): diff --git a/package.json b/package.json index 30ead58..5dae11d 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-nextcloud", "description": "Generate c4k yaml for a nextcloud deployment.", "author": "meissa GmbH", - "version": "8.0.3", + "version": "8.0.4-SNAPSHOT", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud#readme", "repository": "https://www.npmjs.com/package/c4k-nextcloud", "license": "APACHE2", diff --git a/project.clj b/project.clj index 7a623f4..f9d8ac3 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.3" +(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.4-SNAPSHOT" :description "nextcloud c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From f8bcbe63baf99cf59bc95cacc835727885cc027c Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 15 Mar 2024 15:36:34 +0100 Subject: [PATCH 12/28] release: 8.0.4 --- infrastructure/backup/build.py | 2 +- infrastructure/nextcloud/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure/backup/build.py b/infrastructure/backup/build.py index ccc2683..50870ef 100644 --- a/infrastructure/backup/build.py +++ b/infrastructure/backup/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-cloud" MODULE = "backup" PROJECT_ROOT_PATH = "../.." -version = "8.0.4-dev" +version = "8.0.4" @init diff --git a/infrastructure/nextcloud/build.py b/infrastructure/nextcloud/build.py index 3527dad..63eea38 100644 --- a/infrastructure/nextcloud/build.py +++ b/infrastructure/nextcloud/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = 'c4k-cloud' MODULE = 'not_set' PROJECT_ROOT_PATH = '../..' -version = "8.0.4-dev" +version = "8.0.4" @init def initialize(project): diff --git a/package.json b/package.json index 5dae11d..e9d4e2d 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-nextcloud", "description": "Generate c4k yaml for a nextcloud deployment.", "author": "meissa GmbH", - "version": "8.0.4-SNAPSHOT", + "version": "8.0.4", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud#readme", "repository": "https://www.npmjs.com/package/c4k-nextcloud", "license": "APACHE2", diff --git a/project.clj b/project.clj index f9d8ac3..5f8037d 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.4-SNAPSHOT" +(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.4" :description "nextcloud c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From 7d9ca203bb2545e6da6e556285a09e3a7216bc92 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 15 Mar 2024 15:36:34 +0100 Subject: [PATCH 13/28] bump version to: 8.0.5-SNAPSHOT --- infrastructure/backup/build.py | 2 +- infrastructure/nextcloud/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure/backup/build.py b/infrastructure/backup/build.py index 50870ef..b4d450e 100644 --- a/infrastructure/backup/build.py +++ b/infrastructure/backup/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-cloud" MODULE = "backup" PROJECT_ROOT_PATH = "../.." -version = "8.0.4" +version = "8.0.5-dev" @init diff --git a/infrastructure/nextcloud/build.py b/infrastructure/nextcloud/build.py index 63eea38..e3fa453 100644 --- a/infrastructure/nextcloud/build.py +++ b/infrastructure/nextcloud/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = 'c4k-cloud' MODULE = 'not_set' PROJECT_ROOT_PATH = '../..' -version = "8.0.4" +version = "8.0.5-dev" @init def initialize(project): diff --git a/package.json b/package.json index e9d4e2d..a34d018 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-nextcloud", "description": "Generate c4k yaml for a nextcloud deployment.", "author": "meissa GmbH", - "version": "8.0.4", + "version": "8.0.5-SNAPSHOT", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud#readme", "repository": "https://www.npmjs.com/package/c4k-nextcloud", "license": "APACHE2", diff --git a/project.clj b/project.clj index 5f8037d..0a7c0d5 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.4" +(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.5-SNAPSHOT" :description "nextcloud c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From ef8bfa11fcb41f9d1e632102b9adf2fbdc9f158f Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 15 Mar 2024 15:47:46 +0100 Subject: [PATCH 14/28] release: 8.0.5 --- infrastructure/backup/build.py | 2 +- infrastructure/nextcloud/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure/backup/build.py b/infrastructure/backup/build.py index b4d450e..1bf9f46 100644 --- a/infrastructure/backup/build.py +++ b/infrastructure/backup/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-cloud" MODULE = "backup" PROJECT_ROOT_PATH = "../.." -version = "8.0.5-dev" +version = "8.0.5" @init diff --git a/infrastructure/nextcloud/build.py b/infrastructure/nextcloud/build.py index e3fa453..6e985ab 100644 --- a/infrastructure/nextcloud/build.py +++ b/infrastructure/nextcloud/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = 'c4k-cloud' MODULE = 'not_set' PROJECT_ROOT_PATH = '../..' -version = "8.0.5-dev" +version = "8.0.5" @init def initialize(project): diff --git a/package.json b/package.json index a34d018..c2fcdb0 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-nextcloud", "description": "Generate c4k yaml for a nextcloud deployment.", "author": "meissa GmbH", - "version": "8.0.5-SNAPSHOT", + "version": "8.0.5", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud#readme", "repository": "https://www.npmjs.com/package/c4k-nextcloud", "license": "APACHE2", diff --git a/project.clj b/project.clj index 0a7c0d5..6df41a9 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.5-SNAPSHOT" +(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.5" :description "nextcloud c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From ab4c6e0d768c178e9b1dc7f7625250a822259545 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 15 Mar 2024 15:47:46 +0100 Subject: [PATCH 15/28] bump version to: 8.0.6-SNAPSHOT --- infrastructure/backup/build.py | 2 +- infrastructure/nextcloud/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure/backup/build.py b/infrastructure/backup/build.py index 1bf9f46..570ebd8 100644 --- a/infrastructure/backup/build.py +++ b/infrastructure/backup/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-cloud" MODULE = "backup" PROJECT_ROOT_PATH = "../.." -version = "8.0.5" +version = "8.0.6-dev" @init diff --git a/infrastructure/nextcloud/build.py b/infrastructure/nextcloud/build.py index 6e985ab..0d8315f 100644 --- a/infrastructure/nextcloud/build.py +++ b/infrastructure/nextcloud/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = 'c4k-cloud' MODULE = 'not_set' PROJECT_ROOT_PATH = '../..' -version = "8.0.5" +version = "8.0.6-dev" @init def initialize(project): diff --git a/package.json b/package.json index c2fcdb0..f771c89 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-nextcloud", "description": "Generate c4k yaml for a nextcloud deployment.", "author": "meissa GmbH", - "version": "8.0.5", + "version": "8.0.6-SNAPSHOT", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud#readme", "repository": "https://www.npmjs.com/package/c4k-nextcloud", "license": "APACHE2", diff --git a/project.clj b/project.clj index 6df41a9..4bd93e4 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.5" +(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.6-SNAPSHOT" :description "nextcloud c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From fcf6d7783e41baf320ff7ac48b1fc1bc7e753c0d Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 22 Mar 2024 13:42:31 +0100 Subject: [PATCH 16/28] Add namespace --- src/main/cljc/dda/c4k_nextcloud/core.cljc | 1 + src/main/resources/backup/backup-restore-deployment.yaml | 1 + src/main/resources/backup/config.yaml | 1 + src/main/resources/backup/cron.yaml | 1 + src/main/resources/backup/secret.yaml | 1 + src/main/resources/nextcloud/deployment.yaml | 1 + src/main/resources/nextcloud/pvc.yaml | 1 + src/main/resources/nextcloud/secret.yaml | 1 + src/main/resources/nextcloud/service.yaml | 1 + src/test/cljc/dda/c4k_nextcloud/backup_test.cljc | 5 +++-- src/test/cljc/dda/c4k_nextcloud/nextcloud_test.cljc | 7 ++++--- 11 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/cljc/dda/c4k_nextcloud/core.cljc b/src/main/cljc/dda/c4k_nextcloud/core.cljc index 95ead37..72feec3 100644 --- a/src/main/cljc/dda/c4k_nextcloud/core.cljc +++ b/src/main/cljc/dda/c4k_nextcloud/core.cljc @@ -28,6 +28,7 @@ :pv-storage-size-gb 50 :pvc-storage-class-name default-storage-class} auth) + (ns/generate (merge {:namespace "nextcloud"} config)) [(nextcloud/generate-secret auth) (nextcloud/generate-pvc (merge nextcloud-default-storage-config config)) (nextcloud/generate-deployment config) diff --git a/src/main/resources/backup/backup-restore-deployment.yaml b/src/main/resources/backup/backup-restore-deployment.yaml index ffe9951..d560412 100644 --- a/src/main/resources/backup/backup-restore-deployment.yaml +++ b/src/main/resources/backup/backup-restore-deployment.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: backup-restore + namespace: nextcloud spec: replicas: 0 selector: diff --git a/src/main/resources/backup/config.yaml b/src/main/resources/backup/config.yaml index 17aa35c..e48e088 100644 --- a/src/main/resources/backup/config.yaml +++ b/src/main/resources/backup/config.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: backup-config + namespace: nextcloud labels: app.kubernetes.io/name: backup app.kubernetes.io/part-of: cloud diff --git a/src/main/resources/backup/cron.yaml b/src/main/resources/backup/cron.yaml index df933c8..0424ec6 100644 --- a/src/main/resources/backup/cron.yaml +++ b/src/main/resources/backup/cron.yaml @@ -2,6 +2,7 @@ apiVersion: batch/v1 kind: CronJob metadata: name: cloud-backup + namespace: nextcloud labels: app.kubernetes.part-of: cloud spec: diff --git a/src/main/resources/backup/secret.yaml b/src/main/resources/backup/secret.yaml index d345d7e..02a03eb 100644 --- a/src/main/resources/backup/secret.yaml +++ b/src/main/resources/backup/secret.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Secret metadata: name: backup-secret + namespace: nextcloud type: Opaque data: aws-access-key-id: "aws-access-key-id" diff --git a/src/main/resources/nextcloud/deployment.yaml b/src/main/resources/nextcloud/deployment.yaml index 1dd46da..676cfbc 100644 --- a/src/main/resources/nextcloud/deployment.yaml +++ b/src/main/resources/nextcloud/deployment.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: cloud-deployment + namespace: nextcloud spec: selector: matchLabels: diff --git a/src/main/resources/nextcloud/pvc.yaml b/src/main/resources/nextcloud/pvc.yaml index 029723b..76fb92d 100644 --- a/src/main/resources/nextcloud/pvc.yaml +++ b/src/main/resources/nextcloud/pvc.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: cloud-pvc + namespace: nextcloud labels: app.kubernetes.io/application: cloud spec: diff --git a/src/main/resources/nextcloud/secret.yaml b/src/main/resources/nextcloud/secret.yaml index 58d649b..e8f014d 100644 --- a/src/main/resources/nextcloud/secret.yaml +++ b/src/main/resources/nextcloud/secret.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Secret metadata: name: cloud-secret + namespace: nextcloud type: Opaque data: nextcloud-admin-user: "admin-user" diff --git a/src/main/resources/nextcloud/service.yaml b/src/main/resources/nextcloud/service.yaml index 2ef29e4..76b4ef2 100644 --- a/src/main/resources/nextcloud/service.yaml +++ b/src/main/resources/nextcloud/service.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: cloud-service + namespace: nextcloud labels: app.kubernetes.io/name: cloud-service app.kubernetes.io/application: cloud diff --git a/src/test/cljc/dda/c4k_nextcloud/backup_test.cljc b/src/test/cljc/dda/c4k_nextcloud/backup_test.cljc index 3eb79c9..9a0ccfa 100644 --- a/src/test/cljc/dda/c4k_nextcloud/backup_test.cljc +++ b/src/test/cljc/dda/c4k_nextcloud/backup_test.cljc @@ -8,7 +8,7 @@ (deftest should-generate-secret (is (= {:apiVersion "v1" :kind "Secret" - :metadata {:name "backup-secret"} + :metadata {:name "backup-secret", :namespace "nextcloud"} :type "Opaque" :data {:aws-access-key-id "YXdzLWlk", :aws-secret-access-key "YXdzLXNlY3JldA==", :restic-password "cmVzdGljLXB3"}} @@ -18,6 +18,7 @@ (is (= {:apiVersion "v1" :kind "ConfigMap" :metadata {:name "backup-config" + :namespace "nextcloud" :labels {:app.kubernetes.io/name "backup" :app.kubernetes.io/part-of "cloud"}} :data @@ -27,7 +28,7 @@ (deftest should-generate-cron (is (= {:apiVersion "batch/v1" :kind "CronJob" - :metadata {:name "cloud-backup", :labels {:app.kubernetes.part-of "cloud"}} + :metadata {:name "cloud-backup", :namespace "nextcloud", :labels {:app.kubernetes.part-of "cloud"}} :spec {:schedule "10 23 * * *" :successfulJobsHistoryLimit 1 diff --git a/src/test/cljc/dda/c4k_nextcloud/nextcloud_test.cljc b/src/test/cljc/dda/c4k_nextcloud/nextcloud_test.cljc index 8919c24..cb4ab1b 100644 --- a/src/test/cljc/dda/c4k_nextcloud/nextcloud_test.cljc +++ b/src/test/cljc/dda/c4k_nextcloud/nextcloud_test.cljc @@ -23,7 +23,7 @@ (deftest should-generate-secret (is (= {:apiVersion "v1" :kind "Secret" - :metadata {:name "cloud-secret"} + :metadata {:name "cloud-secret", :namespace "nextcloud"} :type "Opaque" :data {:nextcloud-admin-user "Y2xvdWRhZG1pbg==" @@ -77,7 +77,8 @@ (is (= {:apiVersion "v1" :kind "PersistentVolumeClaim" :metadata {:name "cloud-pvc" - :labels {:app.kubernetes.io/application "cloud"}} + :namespace "nextcloud" + :labels {:app.kubernetes.io/application "cloud"}} :spec {:storageClassName "local-path" :accessModes ["ReadWriteOnce"] :resources {:requests {:storage "50Gi"}}}} @@ -86,7 +87,7 @@ (deftest should-generate-deployment (is (= {:apiVersion "apps/v1" :kind "Deployment" - :metadata {:name "cloud-deployment"} + :metadata {:name "cloud-deployment", :namespace "nextcloud"} :spec {:selector {:matchLabels #:app.kubernetes.io{:name "cloud-pod", :application "cloud"}} :strategy {:type "Recreate"} From 3bdf2ea55383b4a00ddfbfa9dda82f9668263670 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 22 Mar 2024 13:52:45 +0100 Subject: [PATCH 17/28] Require namespace namespace --- src/main/cljc/dda/c4k_nextcloud/core.cljc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/cljc/dda/c4k_nextcloud/core.cljc b/src/main/cljc/dda/c4k_nextcloud/core.cljc index 72feec3..f64e6d2 100644 --- a/src/main/cljc/dda/c4k_nextcloud/core.cljc +++ b/src/main/cljc/dda/c4k_nextcloud/core.cljc @@ -8,7 +8,8 @@ [dda.c4k-common.postgres :as postgres] [dda.c4k-nextcloud.nextcloud :as nextcloud] [dda.c4k-nextcloud.backup :as backup] - [dda.c4k-common.monitoring :as mon])) + [dda.c4k-common.monitoring :as mon] + [dda.c4k-common.namespace :as ns])) (def default-storage-class :local-path) From a96cba8cb1446cfb1a42f452cf8f4dc8a03077cd Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 22 Mar 2024 13:53:02 +0100 Subject: [PATCH 18/28] Add test task that runs every test --- build.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/build.py b/build.py index 28d65b4..497602e 100644 --- a/build.py +++ b/build.py @@ -41,18 +41,18 @@ def initialize(project): @task -def test_clj(project): +def test_clj(): run("lein test", shell=True, check=True) @task -def test_cljs(project): +def test_cljs(): run("shadow-cljs compile test", shell=True, check=True) run("node target/node-tests.js", shell=True, check=True) @task -def test_schema(project): +def test_schema(): run("lein uberjar", shell=True, check=True) run( "java -jar target/uberjar/c4k-nextcloud-standalone.jar " @@ -63,6 +63,11 @@ def test_schema(project): check=True, ) +@task +def test(): + test_clj() + test_cljs() + test_schema() @task def report_frontend(project): From 70d41ca5324e3a17bf8e3ff15fa7d22ad0d1f597 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 22 Mar 2024 13:56:35 +0100 Subject: [PATCH 19/28] Bump c4k-common cljs version --- shadow-cljs.edn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shadow-cljs.edn b/shadow-cljs.edn index e409ee5..4be8eac 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -4,7 +4,7 @@ "src/test/cljc" "src/test/cljs" "src/test/resources"] - :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "6.1.3"] + :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "6.2.2"] [hickory "0.7.1"]] :builds {:frontend {:target :browser :modules {:main {:init-fn dda.c4k-nextcloud.browser/init}} From 1fb309f21354a76a59321c73770a642e2d9708af Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 22 Mar 2024 14:04:25 +0100 Subject: [PATCH 20/28] [skip-ci] Remove project parameters --- build.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.py b/build.py index 497602e..748cec4 100644 --- a/build.py +++ b/build.py @@ -227,7 +227,7 @@ def release(project): def linttest(project, release_type): build = get_devops_build(project) build.update_release_type(release_type) - test_clj(project) - test_cljs(project) - test_schema(project) + test_clj() + test_cljs() + test_schema() lint(project) From e8cec9de8ab67b760fe9136588af1b2375b12eaf Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 22 Mar 2024 14:05:08 +0100 Subject: [PATCH 21/28] release: 8.0.6 --- infrastructure/backup/build.py | 2 +- infrastructure/nextcloud/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure/backup/build.py b/infrastructure/backup/build.py index 570ebd8..b315714 100644 --- a/infrastructure/backup/build.py +++ b/infrastructure/backup/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-cloud" MODULE = "backup" PROJECT_ROOT_PATH = "../.." -version = "8.0.6-dev" +version = "8.0.6" @init diff --git a/infrastructure/nextcloud/build.py b/infrastructure/nextcloud/build.py index 0d8315f..6e16274 100644 --- a/infrastructure/nextcloud/build.py +++ b/infrastructure/nextcloud/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = 'c4k-cloud' MODULE = 'not_set' PROJECT_ROOT_PATH = '../..' -version = "8.0.6-dev" +version = "8.0.6" @init def initialize(project): diff --git a/package.json b/package.json index f771c89..896bcab 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-nextcloud", "description": "Generate c4k yaml for a nextcloud deployment.", "author": "meissa GmbH", - "version": "8.0.6-SNAPSHOT", + "version": "8.0.6", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud#readme", "repository": "https://www.npmjs.com/package/c4k-nextcloud", "license": "APACHE2", diff --git a/project.clj b/project.clj index 4bd93e4..3e26f87 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.6-SNAPSHOT" +(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.6" :description "nextcloud c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From fff2c939d9ebf2795ad05bb472f1a46362f1d67a Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 22 Mar 2024 14:05:09 +0100 Subject: [PATCH 22/28] bump version to: 8.0.7-SNAPSHOT --- infrastructure/backup/build.py | 2 +- infrastructure/nextcloud/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure/backup/build.py b/infrastructure/backup/build.py index b315714..d5363ed 100644 --- a/infrastructure/backup/build.py +++ b/infrastructure/backup/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-cloud" MODULE = "backup" PROJECT_ROOT_PATH = "../.." -version = "8.0.6" +version = "8.0.7-dev" @init diff --git a/infrastructure/nextcloud/build.py b/infrastructure/nextcloud/build.py index 6e16274..ae05f8f 100644 --- a/infrastructure/nextcloud/build.py +++ b/infrastructure/nextcloud/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = 'c4k-cloud' MODULE = 'not_set' PROJECT_ROOT_PATH = '../..' -version = "8.0.6" +version = "8.0.7-dev" @init def initialize(project): diff --git a/package.json b/package.json index 896bcab..01c6961 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-nextcloud", "description": "Generate c4k yaml for a nextcloud deployment.", "author": "meissa GmbH", - "version": "8.0.6", + "version": "8.0.7-SNAPSHOT", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud#readme", "repository": "https://www.npmjs.com/package/c4k-nextcloud", "license": "APACHE2", diff --git a/project.clj b/project.clj index 3e26f87..055e072 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.6" +(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.7-SNAPSHOT" :description "nextcloud c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From c05ecfa427aa3bbf82d1d0c13461d18d7adb32fa Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 22 Mar 2024 15:02:24 +0100 Subject: [PATCH 23/28] Pass namespace to postgres --- src/main/cljc/dda/c4k_nextcloud/core.cljc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/cljc/dda/c4k_nextcloud/core.cljc b/src/main/cljc/dda/c4k_nextcloud/core.cljc index f64e6d2..e0eef92 100644 --- a/src/main/cljc/dda/c4k_nextcloud/core.cljc +++ b/src/main/cljc/dda/c4k_nextcloud/core.cljc @@ -27,7 +27,8 @@ (postgres/generate {:postgres-size :8gb :db-name "nextcloud" :pv-storage-size-gb 50 - :pvc-storage-class-name default-storage-class} + :pvc-storage-class-name default-storage-class + :namespace "nextcloud"} auth) (ns/generate (merge {:namespace "nextcloud"} config)) [(nextcloud/generate-secret auth) From ac3f2a455d194defd8886cbb8fd43574d9c532d2 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 22 Mar 2024 15:08:10 +0100 Subject: [PATCH 24/28] Move namespace before postgres --- src/main/cljc/dda/c4k_nextcloud/core.cljc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/cljc/dda/c4k_nextcloud/core.cljc b/src/main/cljc/dda/c4k_nextcloud/core.cljc index e0eef92..9b2fe34 100644 --- a/src/main/cljc/dda/c4k_nextcloud/core.cljc +++ b/src/main/cljc/dda/c4k_nextcloud/core.cljc @@ -24,13 +24,13 @@ (filter #(not (nil? %)) (cm/concat-vec - (postgres/generate {:postgres-size :8gb + (ns/generate (merge {:namespace "nextcloud"} config)) + (postgres/generate {:postgres-size :8gb :db-name "nextcloud" :pv-storage-size-gb 50 :pvc-storage-class-name default-storage-class :namespace "nextcloud"} auth) - (ns/generate (merge {:namespace "nextcloud"} config)) [(nextcloud/generate-secret auth) (nextcloud/generate-pvc (merge nextcloud-default-storage-config config)) (nextcloud/generate-deployment config) From 8727f16c7541da59c58768f70877f072bd937682 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 22 Mar 2024 15:29:01 +0100 Subject: [PATCH 25/28] Add namespace to backup/restore commands --- doc/BackupAndRestore.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/BackupAndRestore.md b/doc/BackupAndRestore.md index ed14a41..7130700 100644 --- a/doc/BackupAndRestore.md +++ b/doc/BackupAndRestore.md @@ -10,37 +10,37 @@ ## Manual init the restic repository for the first time 1. Scale backup-restore deployment up: - `kubectl scale deployment backup-restore --replicas=1` + `kubectl -n nextcloud scale deployment backup-restore --replicas=1` 1. exec into pod and execute restore pod - `kubectl exec -it backup-restore -- /usr/local/bin/init.sh` + `kubectl -n nextcloud exec -it backup-restore -- /usr/local/bin/init.sh` 1. Scale backup-restore deployment down: - `kubectl scale deployment backup-restore --replicas=0` + `kubectl -n nextcloud scale deployment backup-restore --replicas=0` ## Manual backup the restic repository for the first time 1. Scale Cloud deployment down: - `kubectl scale deployment cloud-deployment --replicas=0` + `kubectl -n nextcloud scale deployment cloud-deployment --replicas=0` 1. Scale backup-restore deployment up: - `kubectl scale deployment backup-restore --replicas=1` + `kubectl -n nextcloud scale deployment backup-restore --replicas=1` 1. exec into pod and execute restore pod - `kubectl exec -it backup-restore -- /usr/local/bin/backup.sh` + `kubectl -n nextcloud exec -it backup-restore -- /usr/local/bin/backup.sh` 1. Scale backup-restore deployment down: - `kubectl scale deployment backup-restore --replicas=0` + `kubectl -n nextcloud scale deployment backup-restore --replicas=0` 1. Scale Cloud deployment up: - `kubectl scale deployment cloud-deployment --replicas=1` + `kubectl -n nextcloud scale deployment cloud-deployment --replicas=1` ## Manual restore 1. Scale Cloud deployment down: - `kubectl scale deployment cloud-deployment --replicas=0` + `kubectl -n nextcloud scale deployment cloud-deployment --replicas=0` 2. Scale backup-restore deployment up: - `kubectl scale deployment backup-restore --replicas=1` + `kubectl -n nextcloud scale deployment backup-restore --replicas=1` 3. exec into pod and execute restore pod - `kubectl exec -it backup-restore -- /usr/local/bin/restore.sh` + `kubectl -n nextcloud exec -it backup-restore -- /usr/local/bin/restore.sh` 4. Scale backup-restore deployment down: - `kubectl scale deployment backup-restore --replicas=0` + `kubectl -n nextcloud scale deployment backup-restore --replicas=0` 5. Scale Cloud deployment up: - `kubectl scale deployment cloud-deployment --replicas=1` + `kubectl -n nextcloud scale deployment cloud-deployment --replicas=1` From 4a78a3542403439d1a27553dbb761601cdeb20ce Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 22 Mar 2024 15:29:17 +0100 Subject: [PATCH 26/28] Pass namespace to ingress-and-cert --- src/main/cljc/dda/c4k_nextcloud/core.cljc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/cljc/dda/c4k_nextcloud/core.cljc b/src/main/cljc/dda/c4k_nextcloud/core.cljc index 9b2fe34..49a9b6b 100644 --- a/src/main/cljc/dda/c4k_nextcloud/core.cljc +++ b/src/main/cljc/dda/c4k_nextcloud/core.cljc @@ -35,7 +35,7 @@ (nextcloud/generate-pvc (merge nextcloud-default-storage-config config)) (nextcloud/generate-deployment config) (nextcloud/generate-service)] - (nextcloud/generate-ingress-and-cert config) + (nextcloud/generate-ingress-and-cert (merge {:namespace "nextcloud"} config)) (when (:contains? config :restic-repository) [(backup/generate-config config) (backup/generate-secret auth) From 83080b30a8855bea998cf9530c62a3f1a5a0994f Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 22 Mar 2024 15:30:08 +0100 Subject: [PATCH 27/28] release: 8.0.7 --- infrastructure/backup/build.py | 2 +- infrastructure/nextcloud/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure/backup/build.py b/infrastructure/backup/build.py index d5363ed..a24603f 100644 --- a/infrastructure/backup/build.py +++ b/infrastructure/backup/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-cloud" MODULE = "backup" PROJECT_ROOT_PATH = "../.." -version = "8.0.7-dev" +version = "8.0.7" @init diff --git a/infrastructure/nextcloud/build.py b/infrastructure/nextcloud/build.py index ae05f8f..d3466d7 100644 --- a/infrastructure/nextcloud/build.py +++ b/infrastructure/nextcloud/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = 'c4k-cloud' MODULE = 'not_set' PROJECT_ROOT_PATH = '../..' -version = "8.0.7-dev" +version = "8.0.7" @init def initialize(project): diff --git a/package.json b/package.json index 01c6961..dd3d469 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-nextcloud", "description": "Generate c4k yaml for a nextcloud deployment.", "author": "meissa GmbH", - "version": "8.0.7-SNAPSHOT", + "version": "8.0.7", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud#readme", "repository": "https://www.npmjs.com/package/c4k-nextcloud", "license": "APACHE2", diff --git a/project.clj b/project.clj index 055e072..d4101b6 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.7-SNAPSHOT" +(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.7" :description "nextcloud c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From e3968803653c254077efa5737bc868c7d268aac0 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 22 Mar 2024 15:30:08 +0100 Subject: [PATCH 28/28] bump version to: 8.0.8-SNAPSHOT --- infrastructure/backup/build.py | 2 +- infrastructure/nextcloud/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure/backup/build.py b/infrastructure/backup/build.py index a24603f..723e43e 100644 --- a/infrastructure/backup/build.py +++ b/infrastructure/backup/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-cloud" MODULE = "backup" PROJECT_ROOT_PATH = "../.." -version = "8.0.7" +version = "8.0.8-dev" @init diff --git a/infrastructure/nextcloud/build.py b/infrastructure/nextcloud/build.py index d3466d7..4e58064 100644 --- a/infrastructure/nextcloud/build.py +++ b/infrastructure/nextcloud/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = 'c4k-cloud' MODULE = 'not_set' PROJECT_ROOT_PATH = '../..' -version = "8.0.7" +version = "8.0.8-dev" @init def initialize(project): diff --git a/package.json b/package.json index dd3d469..b598de7 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-nextcloud", "description": "Generate c4k yaml for a nextcloud deployment.", "author": "meissa GmbH", - "version": "8.0.7", + "version": "8.0.8-SNAPSHOT", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud#readme", "repository": "https://www.npmjs.com/package/c4k-nextcloud", "license": "APACHE2", diff --git a/project.clj b/project.clj index d4101b6..26f68d9 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.7" +(defproject org.domaindrivenarchitecture/c4k-nextcloud "8.0.8-SNAPSHOT" :description "nextcloud c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0"