From 94e79b573c36bab663d093385fa91aacf841e063 Mon Sep 17 00:00:00 2001 From: Jussi Nummelin Date: Wed, 7 Apr 2021 10:15:41 +0000 Subject: [PATCH] Add mapping for 32bit arms to k0s arm binary Signed-off-by: Jussi Nummelin --- configurer/linux.go | 2 ++ go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configurer/linux.go b/configurer/linux.go index 463a4f9c..a2bd3ea0 100644 --- a/configurer/linux.go +++ b/configurer/linux.go @@ -31,6 +31,8 @@ func (l Linux) Arch(h os.Host) (string, error) { return "amd64", nil case "aarch64": return "arm64", nil + case "armv7l", "armv8l": + return "arm", nil default: return arch, nil } diff --git a/go.mod b/go.mod index 1befcfa3..28993567 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/gammazero/workerpool v1.1.1 github.com/go-playground/validator/v10 v10.4.1 github.com/hashicorp/go-version v1.2.1 - github.com/k0sproject/dig v0.1.0 + github.com/k0sproject/dig v0.1.1 github.com/k0sproject/rig v0.3.8 github.com/logrusorgru/aurora v2.0.3+incompatible github.com/mattn/go-isatty v0.0.12 diff --git a/go.sum b/go.sum index 211c2805..22ebb586 100644 --- a/go.sum +++ b/go.sum @@ -147,8 +147,8 @@ github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/k0sproject/dig v0.1.0 h1:EpdMdt7V5eRvZ1h7hX7AeL9cXbRTXt91oZO1pQBDTSU= -github.com/k0sproject/dig v0.1.0/go.mod h1:rBcqaQlJpcKdt2x/OE/lPvhGU50u/e95CSm5g/r4s78= +github.com/k0sproject/dig v0.1.1 h1:TmNoZtsCXF3jDzwSSEEwKjjD7fG5IyG0p8uvK+z1Wyo= +github.com/k0sproject/dig v0.1.1/go.mod h1:rBcqaQlJpcKdt2x/OE/lPvhGU50u/e95CSm5g/r4s78= github.com/k0sproject/rig v0.3.8 h1:OJB5kfRemBIu0RenDL8iDzmEmtRwwVqQeS01YxQl4zY= github.com/k0sproject/rig v0.3.8/go.mod h1:2FBHQkR4t9VveNzFF4iNuMGx9T171kKPNuS2PFunASI= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=