From d9c4ce02341eb72b2d886bcbd07fba709ee6afaf Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Sun, 27 Dec 2020 14:55:42 +0100 Subject: [PATCH 1/4] Update versions for hotfix --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 82cc13e..8c89e54 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.deviceinsight.helm helm-maven-plugin - 2.8.0 + 2.8.1-SNAPSHOT maven-plugin Helm Maven Plugin From fbdbd9c9a15825ac0343d58143ff80396f49e151 Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Sun, 27 Dec 2020 15:00:24 +0100 Subject: [PATCH 2/4] Fix detection of aarch64 --- CHANGELOG.adoc | 4 ++++ .../kotlin/com/deviceinsight/helm/util/PlatformDetector.kt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index a9ea3b3..3076642 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -1,5 +1,9 @@ = Changelog +== Version 2.8.1 + +* Fix detection of aarch64/arm64 architecture + == Version 2.8.0 * Support configuring the URL to the incubator repository via `incubatorRepoUrl` and allow to disable the incubator repository via `addIncubatorRepo` diff --git a/src/main/kotlin/com/deviceinsight/helm/util/PlatformDetector.kt b/src/main/kotlin/com/deviceinsight/helm/util/PlatformDetector.kt index 8aa9cef..68af9bb 100644 --- a/src/main/kotlin/com/deviceinsight/helm/util/PlatformDetector.kt +++ b/src/main/kotlin/com/deviceinsight/helm/util/PlatformDetector.kt @@ -44,7 +44,7 @@ object PlatformDetector { osArch == "x86_64" || osArch == "amd64" -> "amd64" osArch == "x86" || osArch == "i386" -> "386" osArch == "aarch32" || osArch.startsWith("arm") -> "arm" - osArch.contains("arm64") -> "arm64" + osArch == "aarch64" || osArch.contains("arm64") -> "arm64" osArch.contains("ppc64le") || (osArch.contains("ppc64") && System.getProperty("sun.cpu.endian") == "little") -> "ppc64le" else -> throw IllegalStateException("Unsupported platform architecture '${System.getProperty("os.arch")}'") From bb7f2808b7fcf3b6573e9b982bf41738fd971f5b Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Sun, 27 Dec 2020 15:01:23 +0100 Subject: [PATCH 3/4] Refer to new version in README --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index ac6c654..dda5422 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.0 + 2.8.1 my-chart https://kubernetes-charts.storage.googleapis.com/ From 115009c322d84ef353d8d9bbcbb2584ec04220fe Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Sun, 27 Dec 2020 15:02:13 +0100 Subject: [PATCH 4/4] Update for next development version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8c89e54..b46ebf2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.deviceinsight.helm helm-maven-plugin - 2.8.1-SNAPSHOT + 2.8.1 maven-plugin Helm Maven Plugin