From d15a5614071a0d3fc057fd9de402b0fd92cd6053 Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Mon, 21 Dec 2020 13:20:46 +0100 Subject: [PATCH 01/12] Update for next development version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 82cc13e..7abf32a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.deviceinsight.helm helm-maven-plugin - 2.8.0 + 2.9.0-SNAPSHOT maven-plugin Helm Maven Plugin From ddf037057e3aa35258923997b82461b96c4bc6a2 Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Sun, 27 Dec 2020 15:02:15 +0100 Subject: [PATCH 02/12] Update to hotfix version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7abf32a..b46ebf2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.deviceinsight.helm helm-maven-plugin - 2.9.0-SNAPSHOT + 2.8.1 maven-plugin Helm Maven Plugin From 079258df765153a8459ba049fe573122ab002cbf Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Sun, 27 Dec 2020 15:02:17 +0100 Subject: [PATCH 03/12] Update for next development version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b46ebf2..a2a0f18 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.deviceinsight.helm helm-maven-plugin - 2.8.1 + 2.9.1-SNAPSHOT maven-plugin Helm Maven Plugin From ae53571594491ab86da597c0e4e40f4935ed7743 Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Sun, 27 Dec 2020 15:12:51 +0100 Subject: [PATCH 04/12] Fix upcoming version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a2a0f18..7abf32a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.deviceinsight.helm helm-maven-plugin - 2.9.1-SNAPSHOT + 2.9.0-SNAPSHOT maven-plugin Helm Maven Plugin From 49cbd4fda71e5a4ab55a9e2957d931d87cb97694 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Dec 2020 05:51:13 +0000 Subject: [PATCH 05/12] Bump maven-artifact-transfer from 0.12.0 to 0.13.1 Bumps [maven-artifact-transfer](https://github.com/apache/maven-artifact-transfer) from 0.12.0 to 0.13.1. - [Release notes](https://github.com/apache/maven-artifact-transfer/releases) - [Commits](https://github.com/apache/maven-artifact-transfer/compare/maven-artifact-transfer-0.12.0...maven-artifact-transfer-0.13.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 7abf32a..035819a 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 3.6.0 2.2.1 - 0.12.0 + 0.13.1 2.12.0 4.5.13 From db780a0f1b316345e7c1d9954970ee6b2ae15eae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jan 2021 05:49:10 +0000 Subject: [PATCH 06/12] Bump jackson.version from 2.12.0 to 2.12.1 Bumps `jackson.version` from 2.12.0 to 2.12.1. Updates `jackson-core` from 2.12.0 to 2.12.1 - [Release notes](https://github.com/FasterXML/jackson-core/releases) - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.12.0...jackson-core-2.12.1) Updates `jackson-annotations` from 2.12.0 to 2.12.1 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-dataformat-yaml` from 2.12.0 to 2.12.1 - [Release notes](https://github.com/FasterXML/jackson-dataformats-text/releases) - [Commits](https://github.com/FasterXML/jackson-dataformats-text/compare/jackson-dataformats-text-2.12.0...jackson-dataformats-text-2.12.1) Updates `jackson-module-kotlin` from 2.12.0 to 2.12.1 - [Release notes](https://github.com/FasterXML/jackson-module-kotlin/releases) - [Commits](https://github.com/FasterXML/jackson-module-kotlin/compare/jackson-module-kotlin-2.12.0...jackson-module-kotlin-2.12.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 035819a..19f4f10 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 2.2.1 0.13.1 - 2.12.0 + 2.12.1 4.5.13 5.7.0 From 6560b098080904dd61e9353df89960e1022ba702 Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Tue, 12 Jan 2021 11:48:33 +0100 Subject: [PATCH 07/12] Add troubleshooting info regarding repo deprecation --- README.adoc | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index dda5422..c3e21ab 100644 --- a/README.adoc +++ b/README.adoc @@ -23,7 +23,7 @@ Add the following to your `pom.xml` 2.8.1 my-chart - https://kubernetes-charts.storage.googleapis.com/ + https://charts.helm.sh/stable 3.4.2 true src/test/helm/my-chart/values.yaml @@ -91,7 +91,7 @@ that the correct docker image is used. An example snippet: |skipSnapshots |`true` |If true, SNAPSHOT versions will be built, but not deployed. |helmGroupId |`"com.deviceinsight.helm"` |The helm binary `groupId` |helmArtifactId |`"helm"` |The helm binary `artifactId` -|helmVersion |None |The helm binary `version` +|helmVersion |None |The helm binary `version`. (Make sure to use a recent helm binary version that doesn't use the old Helm Chart repositories from `+https://kubernetes-charts.storage.googleapis.com+`, >= 3.4.0 _or_ >= 2.17.0 if you are still using Helm 2) |helmDownloadUrl |`"https://get.helm.sh/"` |The URL where the helm binary is downloaded from. |helm.skip |`false` |If true, execution will be skipped entirely |strictLint |`false` |If true, linting fails on warnings (see: <>) @@ -166,6 +166,28 @@ To use the `deployAtEnd` functionality it's mandatory to put the Helm Maven Plug .... +== Troubleshooting + +. {blank} +Problem:: The following error message is a common source of trouble, lately: ++ +---- +[ERROR] Output: Error: error initializing: Looks like "https://kubernetes-charts.storage.googleapis.com" is not a valid chart repository or cannot be reached: Failed to fetch https://kubernetes-charts.storage.googleapis.com/index.yaml : 403 Forbidden + +... + +[ERROR] Failed to execute goal com.deviceinsight.helm:helm-maven-plugin:2.8.1:package (default) on project my-project: Error creating helm chart: When executing '/home/user/.m2/repository/com/deviceinsight/helm/helm/2.16.2/helm-2.16.2-linux-amd64.binary init --client-only' got result code '1' -> [Help 1] +---- +Solution:: This is likely due to an old version of helm itself. Make sure to configure `` to a version >= 3.4.0 or, if you are still using Helm 2, a version >= 2.17.0 (https://github.com/helm/charts#%EF%B8%8F-deprecation-and-archive-notice[background information]). +. {blank} ++ +Problem:: The following error message appears if you use an old version of helm-maven-plugin: ++ +---- +[ERROR] Output: Error: error initializing: Looks like "https://kubernetes-charts-incubator.storage.googleapis.com" is not a valid chart repository or cannot be reached: Failed to fetch https://kubernetes-charts-incubator.storage.googleapis.com/index.yaml : 403 Forbidden +---- +Solution:: This can be solved by upgrading helm-maven-plugin itself to version 2.7.0 or later (https://github.com/deviceinsight/helm-maven-plugin/issues/67[#67]). + == Releasing Creating a new release involves the following steps: From fc5a341c6c2416fd8556c98854ac0298f7b1c510 Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Tue, 12 Jan 2021 12:20:55 +0100 Subject: [PATCH 08/12] Eliminate use of old helm(-maven-plugin) versions --- README.adoc | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/README.adoc b/README.adoc index c3e21ab..e361edb 100644 --- a/README.adoc +++ b/README.adoc @@ -140,28 +140,28 @@ To use the `deployAtEnd` functionality it's mandatory to put the Helm Maven Plug ... - com.deviceinsight.helm - helm-maven-plugin - 2.1.0 - - my-chart - https://kubernetes-charts.storage.googleapis.com/ - 2.13.0 - true - src/test/helm/my-chart/values.yaml - true - - - - - package - lint - template - deploy - - - - + com.deviceinsight.helm + helm-maven-plugin + 2.8.1 + + my-chart + https://charts.helm.sh/stable + 3.4.2 + true + src/test/helm/my-chart/values.yaml + true + + + + + package + lint + template + deploy + + + + .... From db29c0899d5a47ee7068e2fc1fe037fe903c2fad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Jan 2021 05:46:55 +0000 Subject: [PATCH 09/12] Bump gitflow-maven-plugin from 1.15.0 to 1.15.1 Bumps [gitflow-maven-plugin](https://github.com/aleksandr-m/gitflow-maven-plugin) from 1.15.0 to 1.15.1. - [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.15.0...v1.15.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 19f4f10..152668e 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 1.4.20 3.8.1 3.2.1 - 1.15.0 + 1.15.1 1.6.8 1.6 From b2b83966578b89cfc871391d0c1c2d948a8274e0 Mon Sep 17 00:00:00 2001 From: Marina Bauer Date: Mon, 18 Jan 2021 15:44:01 +0100 Subject: [PATCH 10/12] Add new setting to overwrite default heelm stable version for helm init 2.x --- CHANGELOG.adoc | 4 ++++ README.adoc | 1 + src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt | 5 ++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 3076642..67a4b0a 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -1,5 +1,9 @@ = Changelog +== Unreleased +* Support configuring the default URL of the helm repository for helm 2.x via `stableRepoUrl` + + == Version 2.8.1 * Fix detection of aarch64/arm64 architecture diff --git a/README.adoc b/README.adoc index e361edb..7ff6a45 100644 --- a/README.adoc +++ b/README.adoc @@ -94,6 +94,7 @@ that the correct docker image is used. An example snippet: |helmVersion |None |The helm binary `version`. (Make sure to use a recent helm binary version that doesn't use the old Helm Chart repositories from `+https://kubernetes-charts.storage.googleapis.com+`, >= 3.4.0 _or_ >= 2.17.0 if you are still using Helm 2) |helmDownloadUrl |`"https://get.helm.sh/"` |The URL where the helm binary is downloaded from. |helm.skip |`false` |If true, execution will be skipped entirely +|stableRepoUrl | `"https://charts.helm.sh/stable"` | For helm 2.x: Can be used to overwrite the default URL for stable repository during `helm init` |strictLint |`false` |If true, linting fails on warnings (see: <>) |valuesFile | None | values file that should be used for goals <>, <> |outputFile | target/test-classes/helm.yaml | output file for <> diff --git a/src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt b/src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt index 7642276..1ed3621 100644 --- a/src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt +++ b/src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt @@ -48,6 +48,9 @@ class PackageMojo : AbstractHelmMojo() { @Parameter(property = "incubatorRepoUrl", defaultValue = "https://charts.helm.sh/incubator") private var incubatorRepoUrl: String = "https://charts.helm.sh/incubator" + @Parameter(property = "stableRepoUrl", defaultValue = "https://charts.helm.sh/stable") + private var stableRepoUrl: String = "https://charts.helm.sh/stable" + @Parameter(property = "addIncubatorRepo", defaultValue = "true") private var addIncubatorRepo: Boolean = true @@ -80,7 +83,7 @@ class PackageMojo : AbstractHelmMojo() { processHelmConfigFiles(targetHelmDir) if (majorHelmVersion() < 3) { - executeCmd("$helm init --client-only") + executeCmd("$helm init --client-only --stable-repo-url $stableRepoUrl") } if (addIncubatorRepo) { From 9488474190d9b2a33363e0031700dd643576e0ba Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Mon, 18 Jan 2021 16:53:31 +0100 Subject: [PATCH 11/12] Update versions for release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 152668e..0d375a8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.deviceinsight.helm helm-maven-plugin - 2.9.0-SNAPSHOT + 2.9.0 maven-plugin Helm Maven Plugin From cd1e98c0664dcc9ba6955009861081e260e14d27 Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Mon, 18 Jan 2021 16:56:06 +0100 Subject: [PATCH 12/12] Prepare release 2.9.0 --- CHANGELOG.adoc | 6 ++++-- README.adoc | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 67a4b0a..d2ccbfe 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -1,8 +1,10 @@ = Changelog == Unreleased -* Support configuring the default URL of the helm repository for helm 2.x via `stableRepoUrl` +== Version 2.9.0 + +* Support configuring the default URL of the helm repository for helm 2.x via `stableRepoUrl` == Version 2.8.1 @@ -24,7 +26,7 @@ == Version 2.6.0 * If the package can't resolve a property an exception is no longer thrown. This behaviour is now logged with a - warning and the packaging mojo continues. + warning, and the packaging mojo continues. == Version 2.5.1 diff --git a/README.adoc b/README.adoc index 7ff6a45..543fb2b 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.8.1 + 2.9.0 my-chart https://charts.helm.sh/stable @@ -143,7 +143,7 @@ To use the `deployAtEnd` functionality it's mandatory to put the Helm Maven Plug com.deviceinsight.helm helm-maven-plugin - 2.8.1 + 2.9.0 my-chart https://charts.helm.sh/stable @@ -177,7 +177,7 @@ Problem:: The following error message is a common source of trouble, lately: ... -[ERROR] Failed to execute goal com.deviceinsight.helm:helm-maven-plugin:2.8.1:package (default) on project my-project: Error creating helm chart: When executing '/home/user/.m2/repository/com/deviceinsight/helm/helm/2.16.2/helm-2.16.2-linux-amd64.binary init --client-only' got result code '1' -> [Help 1] +[ERROR] Failed to execute goal com.deviceinsight.helm:helm-maven-plugin:2.9.0:package (default) on project my-project: Error creating helm chart: When executing '/home/user/.m2/repository/com/deviceinsight/helm/helm/2.16.2/helm-2.16.2-linux-amd64.binary init --client-only' got result code '1' -> [Help 1] ---- Solution:: This is likely due to an old version of helm itself. Make sure to configure `` to a version >= 3.4.0 or, if you are still using Helm 2, a version >= 2.17.0 (https://github.com/helm/charts#%EF%B8%8F-deprecation-and-archive-notice[background information]). . {blank}