Unverified Commit 4a6ac500 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub

Merge pull request #72807 from dixudx/hack_host_arch

add method to get host os/arch in hack scripts
parents 4d72931d 88740dfb
...@@ -98,12 +98,8 @@ kube::util::ensure-temp-dir() { ...@@ -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() { ...@@ -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() { ...@@ -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() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment