From 5cdb762fb9ade92f258a4f3e18b5a60521c9b981 Mon Sep 17 00:00:00 2001 From: Bin Lu Date: Thu, 10 Jan 2019 17:29:49 +0800 Subject: [PATCH] Bug fix: ./hack/install-etcd.sh is not work on Arm64 platform Signed-off-by: Bin Lu --- hack/lib/etcd.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh index 5423d246c52..a6a3b936115 100755 --- a/hack/lib/etcd.sh +++ b/hack/lib/etcd.sh @@ -105,11 +105,16 @@ kube::etcd::cleanup() { kube::etcd::install() { ( local os + local arch + + os=$(kube::util::host_os) + arch=$(kube::util::host_arch) + cd "${KUBE_ROOT}/third_party" - os=$(uname | tr "[:upper:]" "[:lower:]") if [[ $(readlink etcd) == etcd-v${ETCD_VERSION}-${os}-* ]]; then return # already installed fi + if [[ ${os} == "darwin" ]]; then download_file="etcd-v${ETCD_VERSION}-darwin-amd64.zip" url="https://github.com/coreos/etcd/releases/download/v${ETCD_VERSION}/${download_file}" @@ -118,11 +123,11 @@ kube::etcd::install() { ln -fns "etcd-v${ETCD_VERSION}-darwin-amd64" etcd rm "${download_file}" else - url="https://github.com/coreos/etcd/releases/download/v${ETCD_VERSION}/etcd-v${ETCD_VERSION}-linux-amd64.tar.gz" - download_file="etcd-v${ETCD_VERSION}-linux-amd64.tar.gz" + url="https://github.com/coreos/etcd/releases/download/v${ETCD_VERSION}/etcd-v${ETCD_VERSION}-linux-${arch}.tar.gz" + download_file="etcd-v${ETCD_VERSION}-linux-${arch}.tar.gz" kube::util::download_file "${url}" "${download_file}" tar xzf "${download_file}" - ln -fns "etcd-v${ETCD_VERSION}-linux-amd64" etcd + ln -fns "etcd-v${ETCD_VERSION}-linux-${arch}" etcd rm "${download_file}" fi kube::log::info "etcd v${ETCD_VERSION} installed. To use:"