Fix krew on Apple silicon

Signed-off-by: Richard Gee <richard@technologee.co.uk>
alexellis · Jan 10, 2023 · 98d1d7b · 98d1d7b
1 parent 0f3b38e
commit 98d1d7b
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 17 deletions.
diff --git a/pkg/get/get_test.go b/pkg/get/get_test.go
@@ -3312,38 +3312,56 @@ func Test_DownloadKrew(t *testing.T) {
 		{
 			os:      "darwin",
 			arch:    arch64bit,
-			version: "v0.4.2",
-			url:     `https://github.com/kubernetes-sigs/krew/releases/download/v0.4.2/krew-darwin_amd64.tar.gz`,
+			version: "v0.4.3",
+			url:     `https://github.com/kubernetes-sigs/krew/releases/download/v0.4.3/krew-darwin_amd64.tar.gz`,
 		},
 		{
 			os:      "darwin",
 			arch:    archARM64,
-			version: "v0.4.2",
-			url:     `https://github.com/kubernetes-sigs/krew/releases/download/v0.4.2/krew-darwin_arm64.tar.gz`,
+			version: "v0.4.3",
+			url:     `https://github.com/kubernetes-sigs/krew/releases/download/v0.4.3/krew-darwin_arm64.tar.gz`,
+		},
+		{
+			os:      "darwin",
+			arch:    archDarwinARM64,
+			version: "v0.4.3",
+			url:     `https://github.com/kubernetes-sigs/krew/releases/download/v0.4.3/krew-darwin_arm64.tar.gz`,
 		},
 		{
 			os:      "linux",
 			arch:    archARM64,
-			version: "v0.4.2",
-			url:     `https://github.com/kubernetes-sigs/krew/releases/download/v0.4.2/krew-linux_arm64.tar.gz`,
+			version: "v0.4.3",
+			url:     `https://github.com/kubernetes-sigs/krew/releases/download/v0.4.3/krew-linux_arm64.tar.gz`,
 		},
 		{
 			os:      "linux",
 			arch:    arch64bit,
-			version: "v0.4.2",
-			url:     `https://github.com/kubernetes-sigs/krew/releases/download/v0.4.2/krew-linux_amd64.tar.gz`,
+			version: "v0.4.3",
+			url:     `https://github.com/kubernetes-sigs/krew/releases/download/v0.4.3/krew-linux_amd64.tar.gz`,
 		},
 		{
 			os:      "linux",
 			arch:    archARM7,
-			version: "v0.4.2",
-			url:     `https://github.com/kubernetes-sigs/krew/releases/download/v0.4.2/krew-linux_arm.tar.gz`,
+			version: "v0.4.3",
+			url:     `https://github.com/kubernetes-sigs/krew/releases/download/v0.4.3/krew-linux_arm.tar.gz`,
 		},
 		{
 			os:      "ming",
 			arch:    arch64bit,
-			version: "v0.4.2",
-			url:     `https://github.com/kubernetes-sigs/krew/releases/download/v0.4.2/krew-windows_amd64.tar.gz`,
+			version: "v0.4.3",
+			url:     `https://github.com/kubernetes-sigs/krew/releases/download/v0.4.3/krew-windows_amd64.tar.gz`,
+		},
+		{
+			os:      "ming",
+			arch:    archARM64,
+			version: "v0.4.3",
+			url:     `https://github.com/kubernetes-sigs/krew/releases/download/v0.4.3/krew-darwin_arm64.tar.gz`,
+		},
+		{
+			os:      "ming",
+			arch:    archDarwinARM64,
+			version: "v0.4.3",
+			url:     `https://github.com/kubernetes-sigs/krew/releases/download/v0.4.3/krew-darwin_arm64.tar.gz`,
 		},
 	}
 
@@ -3354,7 +3372,7 @@ func Test_DownloadKrew(t *testing.T) {
 				t.Fatal(err)
 			}
 			if got != tc.url {
-				t.Errorf("want: %s, got: %s", tc.url, got)
+				t.Errorf("want: %s for %s on %s, got: %s", tc.url, tc.os, tc.arch, got)
 			}
 		})
 	}

diff --git a/pkg/get/tools.go b/pkg/get/tools.go
@@ -1022,13 +1022,13 @@ https://releases.hashicorp.com/{{.Name}}/{{.Version}}/{{.Name}}_{{.Version}}_{{$
 			{{$osStr = "linux_arm64"}}
 			{{- end -}}
 			{{- else if eq .OS "darwin" -}}
-			{{-  if eq .Arch "aarch64" -}}
+			{{-  if or (eq .Arch "aarch64") (eq .Arch "arm64") -}}
 			{{$osStr = "darwin_arm64"}}
 			{{- else if eq .Arch "x86_64" -}}
 			{{$osStr = "darwin_amd64"}}
 			{{- end -}}
 			{{ else if HasPrefix .OS "ming" -}}
-			{{-  if eq .Arch "aarch64" -}}
+			{{-  if or (eq .Arch "aarch64") (eq .Arch "arm64") -}}
 			{{$osStr = "darwin_arm64"}}
 			{{- else if eq .Arch "x86_64" -}}
 			{{$osStr ="windows_amd64"}}
@@ -1046,13 +1046,13 @@ https://releases.hashicorp.com/{{.Name}}/{{.Version}}/{{.Name}}_{{.Version}}_{{$
 			{{$osStr = "linux_arm64"}}
 			{{- end -}}
 			{{- else if eq .OS "darwin" -}}
-			{{-  if eq .Arch "aarch64" -}}
+			{{-  if or (eq .Arch "aarch64") (eq .Arch "arm64") -}}
 			{{$osStr = "darwin_arm64"}}
 			{{- else if eq .Arch "x86_64" -}}
 			{{$osStr = "darwin_amd64"}}
 			{{- end -}}
 			{{ else if HasPrefix .OS "ming" -}}
-			{{-  if eq .Arch "aarch64" -}}
+			{{-  if  or (eq .Arch "aarch64") (eq .Arch "arm64") -}}
 			{{$osStr = "darwin_arm64"}}
 			{{- else if eq .Arch "x86_64" -}}
 			{{$osStr ="windows_amd64"}}