github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #72807 from dixudx/hack_host_arch 

add method to get host os/arch in hack scripts
pull/564/head
Kubernetes Prow Robot 2019-01-17 13:51:24 -08:00 committed by GitHub
parent 4d72931d8f 88740dfb9e
commit 4a6ac500fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hack/lib/util.sh
View File

@ -98,12 +98,8 @@ kube::util::ensure-temp-dir() {
fi fi
} }
# This figures out the host platform without relying on golang. We need this as kube::util::host_os() {
# we don't want a golang install to be a prerequisite to building yet we need
# this info to figure out where the final binaries are placed.
kube::util::host_platform() {
local host_os local host_os
local host_arch
case "$(uname -s)" in case "$(uname -s)" in
Darwin) Darwin)
host_os=darwin host_os=darwin
@ -116,7 +112,11 @@ kube::util::host_platform() {
exit 1 exit 1
;; ;;
esac esac
echo "${host_os}"
}
kube::util::host_arch() {
local host_arch
case "$(uname -m)" in case "$(uname -m)" in
x86_64*) x86_64*)
host_arch=amd64 host_arch=amd64
@ -150,7 +150,14 @@ kube::util::host_platform() {
exit 1 exit 1
;; ;;
esac esac
echo "${host_os}/${host_arch}" echo "${host_arch}"
}
# This figures out the host platform without relying on golang. We need this as
# we don't want a golang install to be a prerequisite to building yet we need
# this info to figure out where the final binaries are placed.
kube::util::host_platform() {
echo "$(kube::util::host_os)/$(kube::util::host_arch)"
} }
kube::util::find-binary-for-platform() { kube::util::find-binary-for-platform() {