diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 1eac99e..6f33e79 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -1,5 +1,10 @@ = Changelog +== 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 * If the package can't resolve a property an exception is no longer thrown. This behaviour is now logged with a diff --git a/pom.xml b/pom.xml index 72cf0ed..0afe40d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.deviceinsight.helm helm-maven-plugin - 2.6.0 + 2.7.0 maven-plugin Helm Maven Plugin @@ -22,13 +22,13 @@ 2.2.1 0.12.0 - 2.11.2 - 4.5.12 + 2.11.3 + 4.5.13 5.7.0 - 3.17.2 + 3.18.0 - 1.4.0 + 1.4.10.2 3.8.1 3.2.1 1.14.0 diff --git a/src/main/kotlin/com/deviceinsight/helm/DeployMojo.kt b/src/main/kotlin/com/deviceinsight/helm/DeployMojo.kt index b88220e..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 != 201) { + if ( (statusCode >= 200) && (statusCode < 300) ) { throw RuntimeException("Unexpected status code when executing $chartPublishMethod request to " + "chart repo ${chartDeploymentRequest.chartPublishUrl()}: $statusCode") } 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"