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

Update etcd to version 2.0.0

Browse Source
This commit is contained in:
Brendan Burns
2015-01-29 15:48:04 -08:00
parent 0345211e0c
commit a20ca78fb3
4 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
hack/lib/etcd.sh
View File

@@ -30,12 +30,26 @@ kube::etcd::start() {
exit 1
fi
version=$(etcd -version | cut -d " " -f 3)
if [[ "${version}" < "2.0.0" ]]; then
kube::log::usage "etcd version 2.0.0 or greater required."
exit 1
fi
# Start etcd
ETCD_DIR=$(mktemp -d -t test-etcd.XXXXXX)
etcd -name test -data-dir ${ETCD_DIR} -addr ${host}:${port} >/dev/null 2>/dev/null &
kube::log::usage "etcd -data-dir ${ETCD_DIR} -addr ${host}:${port} >/dev/null 2>/dev/null"
etcd -data-dir ${ETCD_DIR} -addr ${host}:${port} >/dev/null 2>/dev/null &
ETCD_PID=$!
echo "Waiting for etcd to come up."
while true; do
if curl -L http://127.0.0.1:4001/v2/keys/test -XPUT -d value="test"; then
break
fi
done
kube::util::wait_for_url "http://${host}:${port}/v2/keys/" "etcd: "
kube::util::wait_for_url "http://${host}:${port}/v2/keys/test" "etcd: "
}
kube::etcd::cleanup() {

2
hack/travis/install-etcd.sh
View File

@@ -20,7 +20,7 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
ETCD_VERSION=${ETCD_VERSION:-v0.4.6}
ETCD_VERSION=${ETCD_VERSION:-v2.0.0}
cd "${KUBE_ROOT}/third_party"
curl -sL https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz \