From 2bb986f80ffa465166ec252cb4338664eb15b906 Mon Sep 17 00:00:00 2001 From: ansgarz Date: Sat, 24 Feb 2024 18:31:07 +0100 Subject: [PATCH 01/15] make deprovisionK3sInfra idempotent --- .../provs/server/infrastructure/K3s.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt index 615df3a..4ac8d13 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt @@ -52,7 +52,11 @@ fun Prov.deprovisionK3sInfra() = task { deleteFile(certManagerDeployment.path, sudo = true) deleteFile(certManagerIssuer.path, sudo = true) deleteFile(k3sKubeConfig.path, sudo = true) - cmd("k3s-uninstall.sh") + + val k3sUninstallScript = "k3s-uninstall.sh" + if (chk("which $k3sUninstallScript")) { + cmd(k3sUninstallScript) + } } From 80ae1710524b3614a3024078d80258d2e0e8b731 Mon Sep 17 00:00:00 2001 From: ansgarz Date: Sat, 24 Feb 2024 18:31:40 +0100 Subject: [PATCH 02/15] release: 0.31.1 --- build.gradle | 2 +- build.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index acc5d1d..ec84fd8 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { apply plugin: "maven-publish" -version = "0.31.1-SNAPSHOT" +version = "0.31.1" group = "org.domaindrivenarchitecture.provs" diff --git a/build.py b/build.py index 4391093..aa79d09 100644 --- a/build.py +++ b/build.py @@ -8,7 +8,7 @@ name = "provs" PROJECT_ROOT_PATH = "." -version = "0.31.1-SNAPSHOT" +version = "0.31.1" @init From bc38779b25e78937ec26db5a515b6b7f617b34a5 Mon Sep 17 00:00:00 2001 From: ansgarz Date: Sat, 24 Feb 2024 18:31:40 +0100 Subject: [PATCH 03/15] bump version to: 0.31.2-SNAPSHOT --- build.gradle | 2 +- build.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index ec84fd8..12387b5 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { apply plugin: "maven-publish" -version = "0.31.1" +version = "0.31.2-SNAPSHOT" group = "org.domaindrivenarchitecture.provs" diff --git a/build.py b/build.py index aa79d09..c19faa4 100644 --- a/build.py +++ b/build.py @@ -8,7 +8,7 @@ name = "provs" PROJECT_ROOT_PATH = "." -version = "0.31.1" +version = "0.31.2-dev" @init From d43057bf9d928b3536921d57a60e3e29c5451437 Mon Sep 17 00:00:00 2001 From: ansgarz Date: Sat, 24 Feb 2024 18:43:38 +0100 Subject: [PATCH 04/15] release: 0.32.0 --- build.gradle | 2 +- build.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 12387b5..70231da 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { apply plugin: "maven-publish" -version = "0.31.2-SNAPSHOT" +version = "0.32.0" group = "org.domaindrivenarchitecture.provs" diff --git a/build.py b/build.py index c19faa4..e289448 100644 --- a/build.py +++ b/build.py @@ -8,7 +8,7 @@ name = "provs" PROJECT_ROOT_PATH = "." -version = "0.31.2-dev" +version = "0.32.0" @init From 1d64b4400eff1abe20c737f91a4bcd7912c917f2 Mon Sep 17 00:00:00 2001 From: ansgarz Date: Sat, 24 Feb 2024 18:43:38 +0100 Subject: [PATCH 05/15] bump version to: 0.32.1-SNAPSHOT --- build.gradle | 2 +- build.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 70231da..daea1eb 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { apply plugin: "maven-publish" -version = "0.32.0" +version = "0.32.1-SNAPSHOT" group = "org.domaindrivenarchitecture.provs" diff --git a/build.py b/build.py index e289448..5478898 100644 --- a/build.py +++ b/build.py @@ -8,7 +8,7 @@ name = "provs" PROJECT_ROOT_PATH = "." -version = "0.32.0" +version = "0.32.1-dev" @init From 8191096794be3089109b87c967632321b2a751f6 Mon Sep 17 00:00:00 2001 From: ansgarz Date: Sat, 24 Feb 2024 18:50:40 +0100 Subject: [PATCH 06/15] add release_main_branch to build.py --- build.py | 1 + doc/Release.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.py b/build.py index 5478898..81772d0 100644 --- a/build.py +++ b/build.py @@ -38,6 +38,7 @@ def initialize2(project): "project_root_path": PROJECT_ROOT_PATH, "build_types": [], "mixin_types": ["RELEASE"], + "release_main_branch": "main", "release_primary_build_file": "build.gradle", "release_secondary_build_files": ["build.py"], # release artifacts diff --git a/doc/Release.md b/doc/Release.md index ddc8049..98e2919 100644 --- a/doc/Release.md +++ b/doc/Release.md @@ -5,7 +5,7 @@ release-1.2 or release-1.2.3 I.e.: release-X.X.Z where X, Y, Z are the major, minor resp. the patch level of the release. Z can be omitted. -**Note:** Such kind of release tags should only be applied to commits in the master branch. +**Note:** Such kind of release tags should only be applied to commits in the main branch. ``` #adjust [version] From f9c25a0e1ab1c8b056b65b29439b84e264854e67 Mon Sep 17 00:00:00 2001 From: ansgarz Date: Sat, 24 Feb 2024 18:51:08 +0100 Subject: [PATCH 07/15] release: 0.32.1 --- build.gradle | 2 +- build.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index daea1eb..affca90 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { apply plugin: "maven-publish" -version = "0.32.1-SNAPSHOT" +version = "0.32.1" group = "org.domaindrivenarchitecture.provs" diff --git a/build.py b/build.py index 81772d0..7f6ca8b 100644 --- a/build.py +++ b/build.py @@ -8,7 +8,7 @@ name = "provs" PROJECT_ROOT_PATH = "." -version = "0.32.1-dev" +version = "0.32.1" @init From d0e88c3bf48008725e2ebebbfc89ff26a67b3c8e Mon Sep 17 00:00:00 2001 From: ansgarz Date: Sat, 24 Feb 2024 18:51:08 +0100 Subject: [PATCH 08/15] bump version to: 0.32.2-SNAPSHOT --- build.gradle | 2 +- build.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index affca90..ff4ddf4 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { apply plugin: "maven-publish" -version = "0.32.1" +version = "0.32.2-SNAPSHOT" group = "org.domaindrivenarchitecture.provs" diff --git a/build.py b/build.py index 7f6ca8b..6793c6e 100644 --- a/build.py +++ b/build.py @@ -8,7 +8,7 @@ name = "provs" PROJECT_ROOT_PATH = "." -version = "0.32.1" +version = "0.32.2-dev" @init From 4cf3ab358cd609026572d704234578552bd69ac9 Mon Sep 17 00:00:00 2001 From: ansgarz Date: Sat, 24 Feb 2024 18:57:32 +0100 Subject: [PATCH 09/15] release: 0.32.2 --- build.gradle | 2 +- build.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index ff4ddf4..3f8052d 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { apply plugin: "maven-publish" -version = "0.32.2-SNAPSHOT" +version = "0.32.2" group = "org.domaindrivenarchitecture.provs" diff --git a/build.py b/build.py index 6793c6e..8d43a5a 100644 --- a/build.py +++ b/build.py @@ -8,7 +8,7 @@ name = "provs" PROJECT_ROOT_PATH = "." -version = "0.32.2-dev" +version = "0.32.2" @init From d4115992b0c8bcf408f84a38d2dd206e6c0afa40 Mon Sep 17 00:00:00 2001 From: ansgarz Date: Sat, 24 Feb 2024 18:57:32 +0100 Subject: [PATCH 10/15] bump version to: 0.32.3-SNAPSHOT --- build.gradle | 2 +- build.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 3f8052d..adcb5a2 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { apply plugin: "maven-publish" -version = "0.32.2" +version = "0.32.3-SNAPSHOT" group = "org.domaindrivenarchitecture.provs" diff --git a/build.py b/build.py index 8d43a5a..32476cb 100644 --- a/build.py +++ b/build.py @@ -8,7 +8,7 @@ name = "provs" PROJECT_ROOT_PATH = "." -version = "0.32.2" +version = "0.32.3-dev" @init From 8c6f25598d26bf6b0cafac189dc3c396b981de94 Mon Sep 17 00:00:00 2001 From: ansgarz Date: Sat, 24 Feb 2024 19:33:59 +0100 Subject: [PATCH 11/15] release: 0.33.0 --- build.gradle | 2 +- build.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index adcb5a2..e60682a 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { apply plugin: "maven-publish" -version = "0.32.3-SNAPSHOT" +version = "0.33.0" group = "org.domaindrivenarchitecture.provs" diff --git a/build.py b/build.py index 32476cb..58b688b 100644 --- a/build.py +++ b/build.py @@ -8,7 +8,7 @@ name = "provs" PROJECT_ROOT_PATH = "." -version = "0.32.3-dev" +version = "0.33.0" @init From dd9e7b71b26187243dc34b584c96ec6208bdd75e Mon Sep 17 00:00:00 2001 From: ansgarz Date: Sat, 24 Feb 2024 19:33:59 +0100 Subject: [PATCH 12/15] bump version to: 0.33.1-SNAPSHOT --- build.gradle | 2 +- build.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index e60682a..57fec27 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { apply plugin: "maven-publish" -version = "0.33.0" +version = "0.33.1-SNAPSHOT" group = "org.domaindrivenarchitecture.provs" diff --git a/build.py b/build.py index 58b688b..044bb3b 100644 --- a/build.py +++ b/build.py @@ -8,7 +8,7 @@ name = "provs" PROJECT_ROOT_PATH = "." -version = "0.33.0" +version = "0.33.1-dev" @init From 028543df53ece1a28b5adec5ea83d0f38a9e48e2 Mon Sep 17 00:00:00 2001 From: ansgarz Date: Sat, 24 Feb 2024 20:28:39 +0100 Subject: [PATCH 13/15] update logback --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 57fec27..ed4e7c6 100644 --- a/build.gradle +++ b/build.gradle @@ -76,8 +76,8 @@ dependencies { api('com.charleskorn.kaml:kaml:0.54.0') api("org.slf4j:slf4j-api:1.7.36") - api('ch.qos.logback:logback-classic:1.2.11') - api('ch.qos.logback:logback-core:1.2.11') + api('ch.qos.logback:logback-classic:1.4.14') + api('ch.qos.logback:logback-core:1.4.14') implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlin_version_no") implementation("com.hierynomus:sshj:0.32.0") From ba0f58b02d6a1167a9cc78f7ad00eacbfae57147 Mon Sep 17 00:00:00 2001 From: ansgarz Date: Sat, 24 Feb 2024 20:29:03 +0100 Subject: [PATCH 14/15] release: 0.33.1 --- build.gradle | 2 +- build.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index ed4e7c6..38dae4f 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { apply plugin: "maven-publish" -version = "0.33.1-SNAPSHOT" +version = "0.33.1" group = "org.domaindrivenarchitecture.provs" diff --git a/build.py b/build.py index 044bb3b..087bda6 100644 --- a/build.py +++ b/build.py @@ -8,7 +8,7 @@ name = "provs" PROJECT_ROOT_PATH = "." -version = "0.33.1-dev" +version = "0.33.1" @init From c0e64096a85a2f8893e443f629a3a558744b6843 Mon Sep 17 00:00:00 2001 From: ansgarz Date: Sat, 24 Feb 2024 20:29:03 +0100 Subject: [PATCH 15/15] bump version to: 0.33.2-SNAPSHOT --- build.gradle | 2 +- build.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 38dae4f..a93e17e 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { apply plugin: "maven-publish" -version = "0.33.1" +version = "0.33.2-SNAPSHOT" group = "org.domaindrivenarchitecture.provs" diff --git a/build.py b/build.py index 087bda6..64d9074 100644 --- a/build.py +++ b/build.py @@ -8,7 +8,7 @@ name = "provs" PROJECT_ROOT_PATH = "." -version = "0.33.1" +version = "0.33.2-dev" @init