Merge branch 'hotfix/2.8.1'

deviceinsight · Dec 27, 2020 · 59f8724 · 59f8724
2 parents 42922b7 + 115009c
commit 59f8724
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git 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/README.adoc b/README.adoc
@@ -20,7 +20,7 @@ Add the following to your `pom.xml`
     <plugin>
       <groupId>com.deviceinsight.helm</groupId>
       <artifactId>helm-maven-plugin</artifactId>
-      <version>2.8.0</version>
+      <version>2.8.1</version>
       <configuration>
         <chartName>my-chart</chartName>
         <chartRepoUrl>https://kubernetes-charts.storage.googleapis.com/</chartRepoUrl>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>com.deviceinsight.helm</groupId>
 	<artifactId>helm-maven-plugin</artifactId>
-	<version>2.8.0</version>
+	<version>2.8.1</version>
 	<packaging>maven-plugin</packaging>
 
 	<name>Helm Maven Plugin</name>

diff --git 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")}'")