From fbd58294b2c2152cca7c245d8d32a72cc1c12b5f Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Thu, 8 Oct 2015 15:57:24 -0700
Subject: [PATCH] Update test helpers and dev doc to use etcd v2.0.12.

---
 build/build-image/Dockerfile                  | 7 ++++---
 cluster/mesos/docker/test/bin/install-etcd.sh | 2 +-
 docs/devel/development.md                     | 2 +-
 hack/install-etcd.sh                          | 6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/build/build-image/Dockerfile b/build/build-image/Dockerfile
index a16210480db..b295b6bb471 100644
--- a/build/build-image/Dockerfile
+++ b/build/build-image/Dockerfile
@@ -35,11 +35,12 @@ RUN rm -rf /var/lib/apt/lists/
 RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y rsync
 
 # Download and symlink etcd.  We need this for our integration tests.
+ENV ETCD_VERSION v2.0.12
 RUN mkdir -p /usr/local/src/etcd &&\
     cd /usr/local/src/etcd &&\
-    curl -L -O -s https://github.com/coreos/etcd/releases/download/v2.0.0/etcd-v2.0.0-linux-amd64.tar.gz &&\
-    tar xzf etcd-v2.0.0-linux-amd64.tar.gz &&\
-    ln -s ../src/etcd/etcd-v2.0.0-linux-amd64/etcd /usr/local/bin/
+    curl -fsSLO https://github.com/coreos/etcd/releases/download/$ETCD_VERSION/etcd-$ETCD_VERSION-linux-amd64.tar.gz &&\
+    tar xzf etcd-$ETCD_VERSION-linux-amd64.tar.gz &&\
+    ln -s ../src/etcd/etcd-$ETCD_VERSION-linux-amd64/etcd /usr/local/bin/
 
 # Mark this as a kube-build container
 RUN touch /kube-build-image
diff --git a/cluster/mesos/docker/test/bin/install-etcd.sh b/cluster/mesos/docker/test/bin/install-etcd.sh
index cdc6079fa7d..6efa99b8370 100755
--- a/cluster/mesos/docker/test/bin/install-etcd.sh
+++ b/cluster/mesos/docker/test/bin/install-etcd.sh
@@ -20,7 +20,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-ETCD_VERSION=${ETCD_VERSION:-v2.0.11}
+ETCD_VERSION=${ETCD_VERSION:-v2.0.12}
 
 full_name=etcd-${ETCD_VERSION}-linux-amd64
 archive_url=https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/${full_name}.tar.gz
diff --git a/docs/devel/development.md b/docs/devel/development.md
index 87fb02d57d2..4375d73ed13 100644
--- a/docs/devel/development.md
+++ b/docs/devel/development.md
@@ -264,7 +264,7 @@ Coverage results for the project can also be viewed on [Coveralls](https://cover
 
 ## Integration tests
 
-You need an [etcd](https://github.com/coreos/etcd/releases/tag/v2.0.0) in your path, please make sure it is installed and in your ``$PATH``.
+You need an [etcd](https://github.com/coreos/etcd/releases/tag/v2.0.12) in your path, please make sure it is installed and in your ``$PATH``.
 
 ```sh
 cd kubernetes
diff --git a/hack/install-etcd.sh b/hack/install-etcd.sh
index 9db661d2e57..cd01f20e134 100755
--- a/hack/install-etcd.sh
+++ b/hack/install-etcd.sh
@@ -20,9 +20,9 @@ set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 
-ETCD_VERSION=${ETCD_VERSION:-v2.0.0}
+ETCD_VERSION=${ETCD_VERSION:-v2.0.12}
 
 cd "${KUBE_ROOT}/third_party"
-curl -sL https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz \
+curl -fsSL https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz \
   | tar xzf -
-ln -sF etcd-${ETCD_VERSION}-linux-amd64 etcd
+ln -fns etcd-${ETCD_VERSION}-linux-amd64 etcd