Merge pull request #18417 from Pensu/master

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-12-18 10:35:00 -08:00
commit 0641e4a8f0
4 changed files with 15 additions and 4 deletions

View File

@ -98,9 +98,11 @@ elif [[ "${machine}" == "arm*" ]]; then
arch="arm"
elif [[ "${machine}" == "s390x*" ]]; then
arch="s390x"
elif [[ "${machine}" == "ppc64le" ]]; then
arch="ppc64le"
else
echo "Unknown, unsupported architecture (${machine})."
echo "Supported architectures x86_64, i686, arm, s390x."
echo "Supported architectures x86_64, i686, arm, s390x, ppc64le."
echo "Bailing out."
exit 3
fi

View File

@ -73,8 +73,11 @@ case "$(uname -m)" in
s390x*)
host_arch=s390x
;;
ppc64le*)
host_arch=ppc64le
;;
*)
echo "Unsupported host arch. Must be x86_64, 386, arm or s390x." >&2
echo "Unsupported host arch. Must be x86_64, 386, arm, s390x or ppc64le." >&2
exit 1
;;
esac

View File

@ -153,8 +153,11 @@ kube::util::host_platform() {
s390x*)
host_arch=s390x
;;
ppc64le*)
host_arch=ppc64le
;;
*)
kube::log::error "Unsupported host arch. Must be x86_64, 386, arm or s390x."
kube::log::error "Unsupported host arch. Must be x86_64, 386, arm, s390x or ppc64le."
exit 1
;;
esac

View File

@ -145,8 +145,11 @@ function detect_binary {
s390x*)
host_arch=s390x
;;
ppc64le*)
host_arch=ppc64le
;;
*)
echo "Unsupported host arch. Must be x86_64, 386, arm or s390x." >&2
echo "Unsupported host arch. Must be x86_64, 386, arm, s390x or ppc64le." >&2
exit 1
;;
esac