Fix the arch check of jq in Mac M1 environment

- No official arm64 build for now but the current amd64 binary works for the M1 env, should change to the arm64 binary once jq has official arm64 version in its Github release. - Reference Github issue: jqlang/jq#2386 Signed-off-by: HungWei Chiu <[email protected]>
hwchiu · Apr 3, 2022 · e202577 · e202577
1 parent c50de9b
commit e202577
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/pkg/get/get_test.go b/pkg/get/get_test.go
@@ -2460,6 +2460,11 @@ func Test_DownloadJq(t *testing.T) {
 			arch: arch64bit,
 			url:  prefix + "jq-osx-amd64",
 		},
+		{
+			os:   "darwin",
+			arch: "arm64",
+			url:  prefix + "jq-osx-amd64",
+		},
 		{
 			os:   "linux",
 			arch: arch64bit,

diff --git a/pkg/get/tools.go b/pkg/get/tools.go
@@ -107,6 +107,8 @@ helmfile_{{$os}}_{{$arch}}{{$ext}}`,
 
 {{- if eq .Arch "x86_64" -}}
 {{$arch = "64"}}
+{{- else if eq .Arch "arm64" -}}
+{{$arch = "64"}}
 {{- else -}}
 {{$arch = "32"}}
 {{- end -}}