From 51e7a321cfcfcfcbe95f77940cc093bae9ab45a2 Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Mon, 14 Sep 2020 12:04:04 +0200 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 72cf0ed..935cd3f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.deviceinsight.helm helm-maven-plugin - 2.6.0 + 2.7.0-SNAPSHOT maven-plugin Helm Maven Plugin From f676a69f04cd595e114c7a2ad257d40bf36355e1 Mon Sep 17 00:00:00 2001 From: Chleij Date: Tue, 15 Sep 2020 13:37:15 +0200 Subject: [PATCH 02/11] Allow plugin to succeed when using PUT as upload method and receiving HTTP code 200 --- src/main/kotlin/com/deviceinsight/helm/DeployMojo.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/com/deviceinsight/helm/DeployMojo.kt b/src/main/kotlin/com/deviceinsight/helm/DeployMojo.kt index b88220e..d133f1e 100644 --- a/src/main/kotlin/com/deviceinsight/helm/DeployMojo.kt +++ b/src/main/kotlin/com/deviceinsight/helm/DeployMojo.kt @@ -167,7 +167,7 @@ class DeployMojo : AbstractMojo() { httpClient.execute(request).use { response -> val statusCode = response.statusLine.statusCode - if (statusCode != 201) { + if ( (statusCode != 200) || (statusCode != 201) ) { throw RuntimeException("Unexpected status code when executing $chartPublishMethod request to " + "chart repo ${chartDeploymentRequest.chartPublishUrl()}: $statusCode") } From f13e51f80055bf425d611aca3396cf297afdcff5 Mon Sep 17 00:00:00 2001 From: Chleij Date: Tue, 15 Sep 2020 14:37:41 +0200 Subject: [PATCH 03/11] Changed response code checks to accept any 2XX HTTP status code --- src/main/kotlin/com/deviceinsight/helm/DeployMojo.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/com/deviceinsight/helm/DeployMojo.kt b/src/main/kotlin/com/deviceinsight/helm/DeployMojo.kt index d133f1e..e742276 100644 --- a/src/main/kotlin/com/deviceinsight/helm/DeployMojo.kt +++ b/src/main/kotlin/com/deviceinsight/helm/DeployMojo.kt @@ -167,7 +167,7 @@ class DeployMojo : AbstractMojo() { httpClient.execute(request).use { response -> val statusCode = response.statusLine.statusCode - if ( (statusCode != 200) || (statusCode != 201) ) { + if ( (statusCode >= 200) && (statusCode < 300) ) { throw RuntimeException("Unexpected status code when executing $chartPublishMethod request to " + "chart repo ${chartDeploymentRequest.chartPublishUrl()}: $statusCode") } From 82e4103519846e81c0d6bd481f9e924a87d15a7e Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Tue, 15 Sep 2020 14:45:33 +0200 Subject: [PATCH 04/11] Add changelog entry --- CHANGELOG.adoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 1eac99e..b01c1d5 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -1,5 +1,9 @@ = Changelog +== Version 2.7.0 + +* Accept any 2xx HTTP status code when deploying Helm charts + == 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 From 09445da0d43496cbd69d33165bf8df6a4b60d9a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Sep 2020 06:00:50 +0000 Subject: [PATCH 05/11] Bump dokka-maven-plugin from 1.4.0 to 1.4.10 Bumps dokka-maven-plugin from 1.4.0 to 1.4.10. Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 935cd3f..7ae707d 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 5.7.0 3.17.2 - 1.4.0 + 1.4.10 3.8.1 3.2.1 1.14.0 From c208dbfecd7956e7b9de500442d3b4da4f602619 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Oct 2020 06:00:53 +0000 Subject: [PATCH 06/11] Bump jackson.version from 2.11.2 to 2.11.3 Bumps `jackson.version` from 2.11.2 to 2.11.3. Updates `jackson-core` from 2.11.2 to 2.11.3 - [Release notes](https://github.com/FasterXML/jackson-core/releases) - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.11.2...jackson-core-2.11.3) Updates `jackson-annotations` from 2.11.2 to 2.11.3 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-dataformat-yaml` from 2.11.2 to 2.11.3 - [Release notes](https://github.com/FasterXML/jackson-dataformats-text/releases) - [Commits](https://github.com/FasterXML/jackson-dataformats-text/compare/jackson-dataformats-text-2.11.2...jackson-dataformats-text-2.11.3) Updates `jackson-module-kotlin` from 2.11.2 to 2.11.3 - [Release notes](https://github.com/FasterXML/jackson-module-kotlin/releases) - [Commits](https://github.com/FasterXML/jackson-module-kotlin/compare/jackson-module-kotlin-2.11.2...jackson-module-kotlin-2.11.3) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7ae707d..3a51fa8 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 2.2.1 0.12.0 - 2.11.2 + 2.11.3 4.5.12 5.7.0 From f50a42cb59e7450c2b4a624022af65943b2bbbab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Oct 2020 05:58:20 +0000 Subject: [PATCH 07/11] Bump httpclient from 4.5.12 to 4.5.13 Bumps httpclient from 4.5.12 to 4.5.13. Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3a51fa8..c1e13bb 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 0.12.0 2.11.3 - 4.5.12 + 4.5.13 5.7.0 3.17.2 From 79a96be31ca986715a0d060a84d2a052cbcf4136 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Oct 2020 05:59:49 +0000 Subject: [PATCH 08/11] Bump dokka-maven-plugin from 1.4.10 to 1.4.10.2 Bumps dokka-maven-plugin from 1.4.10 to 1.4.10.2. Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c1e13bb..5b4a540 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 5.7.0 3.17.2 - 1.4.10 + 1.4.10.2 3.8.1 3.2.1 1.14.0 From 06e0522875080d277cdc1784f3ddb0f1057182ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Oct 2020 05:59:56 +0000 Subject: [PATCH 09/11] Bump assertj-core from 3.17.2 to 3.18.0 Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.17.2 to 3.18.0. - [Release notes](https://github.com/assertj/assertj-core/releases) - [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.17.2...assertj-core-3.18.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 c1e13bb..b387cf3 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 4.5.13 5.7.0 - 3.17.2 + 3.18.0 1.4.10 3.8.1 From cfed265d221c1ae99d187fcc2eca5d3776d34ce6 Mon Sep 17 00:00:00 2001 From: Simon Flandergan Date: Mon, 2 Nov 2020 17:14:01 +0100 Subject: [PATCH 10/11] #67: Use new incubator repository hosted at https://charts.helm.sh/incubator --- CHANGELOG.adoc | 1 + src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index b01c1d5..6f33e79 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -3,6 +3,7 @@ == Version 2.7.0 * Accept any 2xx HTTP status code when deploying Helm charts +* Use new incubator repository hosted at https://charts.helm.sh/incubator == Version 2.6.0 diff --git a/src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt b/src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt index 385f1db..a0d50b0 100644 --- a/src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt +++ b/src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt @@ -45,6 +45,8 @@ class PackageMojo : AbstractHelmMojo() { @Parameter(property = "chartRepoPassword", required = false) private var chartRepoPassword: String? = null + private val incubatorRepository = "https://charts.helm.sh/incubator" + @Throws(MojoExecutionException::class) override fun execute() { @@ -77,7 +79,7 @@ class PackageMojo : AbstractHelmMojo() { executeCmd("$helm init --client-only") } - executeCmd("$helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com") + executeCmd("$helm repo add incubator $incubatorRepository") if (chartRepoUrl != null) { val authParams = if (chartRepoUsername != null && chartRepoPassword != null) { " --username $chartRepoUsername --password $chartRepoPassword" From c3de7759c65cc151e21f2b5baa88b3c0b666319c Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Tue, 3 Nov 2020 14:18:15 +0100 Subject: [PATCH 11/11] Update versions for release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b03f1cd..0afe40d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.deviceinsight.helm helm-maven-plugin - 2.7.0-SNAPSHOT + 2.7.0 maven-plugin Helm Maven Plugin