github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26047 from dims/fix-issue-26041

Browse Source 
Automatic merge from submit-queue

Get install-etcd.sh to work on OSX

Check the platform before we download the etcd binary. On OSX, save
the zip file, unzip it and link the directory with the correct
name.

Fixes #26041
This commit is contained in:
k8s-merge-robot 2016-05-30 02:19:02 -07:00
commit 5fd2bb5c20
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hack/lib/etcd.sh
View File

@ -67,8 +67,16 @@ kube::etcd::cleanup() {
kube::etcd::install() { kube::etcd::install() {
( (
cd "${KUBE_ROOT}/third_party" cd "${KUBE_ROOT}/third_party"
curl -fsSL --retry 3 https://github.com/coreos/etcd/releases/download/v${ETCD_VERSION}/etcd-v${ETCD_VERSION}-linux-amd64.tar.gz | tar xzf - if [[ $(uname) == "Darwin" ]]; then
ln -fns "etcd-v${ETCD_VERSION}-linux-amd64" etcd download_file="etcd-v${ETCD_VERSION}-darwin-amd64.zip"
curl -fsSLO --retry 3 https://github.com/coreos/etcd/releases/download/v${ETCD_VERSION}/"${download_file}"
unzip -o "${download_file}"
ln -fns "etcd-v${ETCD_VERSION}-darwin-amd64" etcd
rm "${download_file}"
else
curl -fsSL --retry 3 https://github.com/coreos/etcd/releases/download/v${ETCD_VERSION}/etcd-v${ETCD_VERSION}-linux-amd64.tar.gz | tar xzf -
ln -fns "etcd-v${ETCD_VERSION}-linux-amd64" etcd
fi
kube::log::info "etcd v${ETCD_VERSION} installed. To use:" kube::log::info "etcd v${ETCD_VERSION} installed. To use:"
kube::log::info "export PATH=\${PATH}:$(pwd)/etcd" kube::log::info "export PATH=\${PATH}:$(pwd)/etcd"
) )