github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #72772 from lubinsz/pr_etcd

Browse Source 
Bug fix: ./hack/install-etcd.sh is not work on Arm64 platform
This commit is contained in:
Kubernetes Prow Robot 2019-02-15 06:40:02 -08:00 committed by GitHub
commit aeaeba4a6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hack/lib/etcd.sh
View File

@ -105,13 +105,18 @@ kube::etcd::cleanup() {
kube::etcd::install() { kube::etcd::install() {
( (
local os local os
local arch
os=$(kube::util::host_os)
arch=$(kube::util::host_arch)
cd "${KUBE_ROOT}/third_party" cd "${KUBE_ROOT}/third_party"
os=$(uname | tr "[:upper:]" "[:lower:]")
if [[ $(readlink etcd) == etcd-v${ETCD_VERSION}-${os}-* ]]; then if [[ $(readlink etcd) == etcd-v${ETCD_VERSION}-${os}-* ]]; then
kube::log::info "etcd v${ETCD_VERSION} already installed at path:" kube::log::info "etcd v${ETCD_VERSION} already installed at path:"
kube::log::info "$(pwd)/$(readlink etcd)" kube::log::info "$(pwd)/$(readlink etcd)"
return # already installed return # already installed
fi fi
if [[ ${os} == "darwin" ]]; then if [[ ${os} == "darwin" ]]; then
download_file="etcd-v${ETCD_VERSION}-darwin-amd64.zip" download_file="etcd-v${ETCD_VERSION}-darwin-amd64.zip"
url="https://github.com/coreos/etcd/releases/download/v${ETCD_VERSION}/${download_file}" url="https://github.com/coreos/etcd/releases/download/v${ETCD_VERSION}/${download_file}"
@ -120,11 +125,11 @@ kube::etcd::install() {
ln -fns "etcd-v${ETCD_VERSION}-darwin-amd64" etcd ln -fns "etcd-v${ETCD_VERSION}-darwin-amd64" etcd
rm "${download_file}" rm "${download_file}"
else else
url="https://github.com/coreos/etcd/releases/download/v${ETCD_VERSION}/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-amd64.tar.gz" download_file="etcd-v${ETCD_VERSION}-linux-${arch}.tar.gz"
kube::util::download_file "${url}" "${download_file}" kube::util::download_file "${url}" "${download_file}"
tar xzf "${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}" rm "${download_file}"
fi fi
kube::log::info "etcd v${ETCD_VERSION} installed. To use:" kube::log::info "etcd v${ETCD_VERSION} installed. To use:"