From 71e73986c930aa7d10881cbdd2758ad42875ff35 Mon Sep 17 00:00:00 2001 From: Michael Walser Date: Wed, 1 Mar 2023 15:48:22 +0100 Subject: [PATCH 1/3] Update versions for hotfix --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 83cb8b2..54dd5ef 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.deviceinsight.helm helm-maven-plugin - 2.11.0 + 2.11.1-SNAPSHOT maven-plugin Helm Maven Plugin From d9e4510f5c758709caddb5ff2ff834564f9bfa06 Mon Sep 17 00:00:00 2001 From: Michael Walser Date: Wed, 1 Mar 2023 15:26:36 +0100 Subject: [PATCH 2/3] Fix helm binary path when adding incubator repository --- CHANGELOG.adoc | 4 ++++ src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index e23287c..120e92b 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -1,5 +1,9 @@ = Changelog +== Version 2.11.1 + +* Fix helm binary path when adding incubator repository + == Version 2.11.0 * Support authentication to the helm repository using credentials from server definitions in maven `settings.xml` via `chartRepoServerId`. diff --git a/src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt b/src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt index 2427a58..87811dc 100644 --- a/src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt +++ b/src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt @@ -105,7 +105,7 @@ class PackageMojo : ResolveHelmMojo(), ServerAuthentication { executeCmd(listOf(helm, "init", "--client-only", "--stable-repo-url", stableRepoUrl)) } if (addIncubatorRepo) { - executeCmd(listOf("helm", "repo", "add", "incubator", incubatorRepoUrl) + helmAddFlags) + executeCmd(listOf(helm, "repo", "add", "incubator", incubatorRepoUrl) + helmAddFlags) } if (chartRepoUrl != null) { val server by lazy { getServer(chartRepoServerId) } From d91e22912db93caacfc1c70df10d21f2fba3efd3 Mon Sep 17 00:00:00 2001 From: Michael Walser Date: Wed, 1 Mar 2023 15:50:59 +0100 Subject: [PATCH 3/3] Update for next development version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 54dd5ef..1b2fe90 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.deviceinsight.helm helm-maven-plugin - 2.11.1-SNAPSHOT + 2.11.1 maven-plugin Helm Maven Plugin