Skip to content

K
k3s
Commit 5fd2bb5c authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

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

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
parents 270e8596 0f94aead
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
hack/lib/etcd.sh
View file @ 5fd2bb5c
...@@ -67,8 +67,16 @@ kube::etcd::cleanup() { ...@@ -67,8 +67,16 @@ kube::etcd::cleanup() {
kube::etcd::install() { kube::etcd::install() {
( (
cd "${KUBE_ROOT}/third_party" cd "${KUBE_ROOT}/third_party"
if [[ $(uname) == "Darwin" ]]; then
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 - 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 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"
) )
......
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