From 55208e2c00e32facd61b1d71d561e402670c5a76 Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Tue, 3 Nov 2020 14:19:23 +0100 Subject: [PATCH 01/11] Update for next development version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0afe40d..e33876c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.deviceinsight.helm helm-maven-plugin - 2.7.0 + 2.8.0-SNAPSHOT maven-plugin Helm Maven Plugin From c2429f8f763463381910888f4f226926005b870e Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Tue, 3 Nov 2020 16:32:25 +0100 Subject: [PATCH 02/11] Update to hotfix version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e33876c..13a1d68 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.deviceinsight.helm helm-maven-plugin - 2.8.0-SNAPSHOT + 2.7.1 maven-plugin Helm Maven Plugin From 311641303b0ccb43b712ef978c80fe95bfc910b9 Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Tue, 3 Nov 2020 16:32:29 +0100 Subject: [PATCH 03/11] Update for next development version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 13a1d68..e33876c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.deviceinsight.helm helm-maven-plugin - 2.7.1 + 2.8.0-SNAPSHOT maven-plugin Helm Maven Plugin From 0bb7cbae8576257081b604d3f8ad46827b5ef368 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Nov 2020 05:58:21 +0000 Subject: [PATCH 04/11] Bump gitflow-maven-plugin from 1.14.0 to 1.15.0 Bumps [gitflow-maven-plugin](https://github.com/aleksandr-m/gitflow-maven-plugin) from 1.14.0 to 1.15.0. - [Release notes](https://github.com/aleksandr-m/gitflow-maven-plugin/releases) - [Changelog](https://github.com/aleksandr-m/gitflow-maven-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/aleksandr-m/gitflow-maven-plugin/compare/v1.14.0...v1.15.0) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e33876c..6a596ae 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 1.4.10.2 3.8.1 3.2.1 - 1.14.0 + 1.15.0 1.6.8 1.6 From 28745b88d6df75308291429d98f7ccbea43b650f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Nov 2020 05:57:24 +0000 Subject: [PATCH 05/11] Bump assertj-core from 3.18.0 to 3.18.1 Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.18.0 to 3.18.1. - [Release notes](https://github.com/assertj/assertj-core/releases) - [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.18.0...assertj-core-3.18.1) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e33876c..7c3a6d7 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 4.5.13 5.7.0 - 3.18.0 + 3.18.1 1.4.10.2 3.8.1 From 4bdd28b1252dc1b3f7a5a51c97a452b5d7814672 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Nov 2020 05:54:25 +0000 Subject: [PATCH 06/11] Bump jackson.version from 2.11.3 to 2.12.0 Bumps `jackson.version` from 2.11.3 to 2.12.0. Updates `jackson-core` from 2.11.3 to 2.12.0 - [Release notes](https://github.com/FasterXML/jackson-core/releases) - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.11.3...jackson-core-2.12.0) Updates `jackson-annotations` from 2.11.3 to 2.12.0 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-dataformat-yaml` from 2.11.3 to 2.12.0 - [Release notes](https://github.com/FasterXML/jackson-dataformats-text/releases) - [Commits](https://github.com/FasterXML/jackson-dataformats-text/compare/jackson-dataformats-text-2.11.3...jackson-dataformats-text-2.12.0) Updates `jackson-module-kotlin` from 2.11.3 to 2.12.0 - [Release notes](https://github.com/FasterXML/jackson-module-kotlin/releases) - [Commits](https://github.com/FasterXML/jackson-module-kotlin/compare/jackson-module-kotlin-2.11.3...jackson-module-kotlin-2.12.0) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e33876c..94c9472 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 2.2.1 0.12.0 - 2.11.3 + 2.12.0 4.5.13 5.7.0 From c5662ba944eec5967acb3d1f14ddb62d679d3322 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Dec 2020 06:02:17 +0000 Subject: [PATCH 07/11] Bump dokka-maven-plugin from 1.4.10.2 to 1.4.20 Bumps [dokka-maven-plugin](https://github.com/Kotlin/dokka) from 1.4.10.2 to 1.4.20. - [Release notes](https://github.com/Kotlin/dokka/releases) - [Commits](https://github.com/Kotlin/dokka/compare/v1.4.10.2...v1.4.20) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e33876c..759b5e6 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 5.7.0 3.18.0 - 1.4.10.2 + 1.4.20 3.8.1 3.2.1 1.14.0 From 902a3a826d782af79e8e5fc01b70db0a6a4885ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Dec 2020 06:02:56 +0000 Subject: [PATCH 08/11] Bump kotlin.version from 1.4.10 to 1.4.21 Bumps `kotlin.version` from 1.4.10 to 1.4.21. Updates `kotlin-stdlib-jdk8` from 1.4.10 to 1.4.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.4.10...v1.4.21) Updates `kotlin-test-junit` from 1.4.10 to 1.4.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.4.10...v1.4.21) Updates `kotlin-maven-plugin` from 1.4.10 to 1.4.21 Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 759b5e6..b76825a 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ https://github.com/deviceinsight/helm-maven-plugin - 1.4.10 + 1.4.21 1.8 1.8 1.8 From f2238efc361c800d8bb0a5b40495a5e284c2447f Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Thu, 17 Dec 2020 17:17:15 +0100 Subject: [PATCH 09/11] Allow to configure and disable the incubator repo --- CHANGELOG.adoc | 4 ++++ README.adoc | 8 +++++--- .../kotlin/com/deviceinsight/helm/PackageMojo.kt | 12 +++++++++--- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index ba3acf3..a9ea3b3 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -1,5 +1,9 @@ = Changelog +== Version 2.8.0 + +* Support configuring the URL to the incubator repository via `incubatorRepoUrl` and allow to disable the incubator repository via `addIncubatorRepo` + == Version 2.7.1 * Fix inverted status check which _fails_ for any 2xx HTTP status diff --git a/README.adoc b/README.adoc index 230ec9a..5d8af69 100644 --- a/README.adoc +++ b/README.adoc @@ -20,11 +20,11 @@ Add the following to your `pom.xml` com.deviceinsight.helm helm-maven-plugin - 2.1.0 + 2.7.1 my-chart https://kubernetes-charts.storage.googleapis.com/ - 2.13.0 + 3.4.2 true src/test/helm/my-chart/values.yaml @@ -79,7 +79,9 @@ that the correct docker image is used. An example snippet: |chartName |The Maven `artifactId` |The name of the chart |chartVersion |`${project.model.version}` |The version of the chart -|chartRepoUrl |`"https://kubernetes-helm.storage.googleapis.com/"` |The URL of the Chart repository where dependencies are required from and where charts should be published to +|chartRepoUrl |`null` |The URL of the Chart repository where dependencies are required from and where charts should be published to +|incubatorRepoUrl |`https://charts.helm.sh/incubator` |The URL to the incubator Chart repository +|addIncubatorRepo |`true` |Whether the repository defined in `incubatorRepoUrl` should be added when running the package goal |chartPublishUrl |`${chartRepoUrl}/api/charts` |The URL that will be used for publishing the chart. The default value will work if `chartRepoUrl` refers to a ChartMuseum. |chartPublishMethod |"POST" |The HTTP method that will be used for publishing requests |chartDeleteUrl |`${chartRepoUrl}/api/charts/${chartName}/${chartVersion}` |The URL that will be used for deleting a previous version of the chart. This is used for updating SNAPSHOT versions. The default value will work if `chartRepoUrl` refers to a ChartMuseum. diff --git a/src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt b/src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt index a0d50b0..7642276 100644 --- a/src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt +++ b/src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt @@ -29,7 +29,7 @@ import java.io.File class PackageMojo : AbstractHelmMojo() { companion object { - private val PLACEHOLDER_REGEX = Regex("""\$\{(.*?)\}""") + private val PLACEHOLDER_REGEX = Regex("""\$\{(.*?)}""") private val SUBSTITUTED_EXTENSIONS = setOf("json", "tpl", "yml", "yaml") } @@ -45,7 +45,11 @@ class PackageMojo : AbstractHelmMojo() { @Parameter(property = "chartRepoPassword", required = false) private var chartRepoPassword: String? = null - private val incubatorRepository = "https://charts.helm.sh/incubator" + @Parameter(property = "incubatorRepoUrl", defaultValue = "https://charts.helm.sh/incubator") + private var incubatorRepoUrl: String = "https://charts.helm.sh/incubator" + + @Parameter(property = "addIncubatorRepo", defaultValue = "true") + private var addIncubatorRepo: Boolean = true @Throws(MojoExecutionException::class) override fun execute() { @@ -79,7 +83,9 @@ class PackageMojo : AbstractHelmMojo() { executeCmd("$helm init --client-only") } - executeCmd("$helm repo add incubator $incubatorRepository") + if (addIncubatorRepo) { + executeCmd("$helm repo add incubator $incubatorRepoUrl") + } if (chartRepoUrl != null) { val authParams = if (chartRepoUsername != null && chartRepoPassword != null) { " --username $chartRepoUsername --password $chartRepoPassword" From 37c6430bc618e800bb6cd36574a02e99ba0eb2d9 Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Mon, 21 Dec 2020 13:19:17 +0100 Subject: [PATCH 10/11] Update versions for release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f198ceb..82cc13e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.deviceinsight.helm helm-maven-plugin - 2.8.0-SNAPSHOT + 2.8.0 maven-plugin Helm Maven Plugin From 1dcbfd176b221b6c5f7c57f20caedb4307fb61ba Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Mon, 21 Dec 2020 13:19:48 +0100 Subject: [PATCH 11/11] Update plugin version in README --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 5d8af69..ac6c654 100644 --- a/README.adoc +++ b/README.adoc @@ -20,7 +20,7 @@ Add the following to your `pom.xml` com.deviceinsight.helm helm-maven-plugin - 2.7.1 + 2.8.0 my-chart https://kubernetes-charts.storage.googleapis.com/