Update etcd to version 2.0.0

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

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() {