From 543c2c20acd1328e0f4954492890cabecaff6238 Mon Sep 17 00:00:00 2001
From: Wojciech Tyczynski <wojtekt@google.com>
Date: Thu, 27 Oct 2016 13:47:52 +0200
Subject: [PATCH] Update etcd in tests to 3.0.13

---
 build-tools/build-image/cross/Dockerfile | 2 +-
 build-tools/build-image/cross/VERSION    | 2 +-
 cluster/images/etcd/Makefile             | 6 +++---
 cluster/images/etcd/migrate-if-needed.sh | 8 ++++----
 hack/lib/etcd.sh                         | 2 +-
 hack/test-update-storage-objects.sh      | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build-tools/build-image/cross/Dockerfile b/build-tools/build-image/cross/Dockerfile
index c9a176fe8cd..749bf3bf7f1 100644
--- a/build-tools/build-image/cross/Dockerfile
+++ b/build-tools/build-image/cross/Dockerfile
@@ -72,7 +72,7 @@ RUN mkdir $TMPDIR \
             github.com/jteeuwen/go-bindata/go-bindata
 
 # Download and symlink etcd. We need this for our integration tests.
-RUN export ETCD_VERSION=v3.0.10; \
+RUN export ETCD_VERSION=v3.0.13; \
   mkdir -p /usr/local/src/etcd \
   && cd /usr/local/src/etcd \
   && curl -fsSL https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz | tar -xz \
diff --git a/build-tools/build-image/cross/VERSION b/build-tools/build-image/cross/VERSION
index 7c727ed6d36..08acdfb9caf 100644
--- a/build-tools/build-image/cross/VERSION
+++ b/build-tools/build-image/cross/VERSION
@@ -1 +1 @@
-v1.7.1-0
+v1.7.1-2
diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile
index 3c2fd2805b2..b37270fa8b0 100644
--- a/cluster/images/etcd/Makefile
+++ b/cluster/images/etcd/Makefile
@@ -15,7 +15,7 @@
 # Build the etcd image
 #
 # Usage:
-# 	[TAGS=2.2.1 2.3.7 3.0.12] [REGISTRY=gcr.io/google_containers] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
+# 	[TAGS=2.2.1 2.3.7 3.0.13] [REGISTRY=gcr.io/google_containers] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
 
 # The image contains different etcd versions to simplify
 # upgrades. Thus be careful when removing any tag from here.
@@ -26,8 +26,8 @@
 # Except from etcd-$(tag) and etcdctl-$(tag) binaries, we also
 # need etcd and etcdctl binaries for backward compatibility reasons.
 # That binary will be set to the last tag from $(TAGS).
-TAGS?=2.2.1 2.3.7 3.0.12
-REGISTRY_TAG?=3.0.12
+TAGS?=2.2.1 2.3.7 3.0.13
+REGISTRY_TAG?=3.0.13
 ARCH?=amd64
 REGISTRY?=gcr.io/google_containers
 GOLANG_VERSION?=1.6.3
diff --git a/cluster/images/etcd/migrate-if-needed.sh b/cluster/images/etcd/migrate-if-needed.sh
index fc36b8496e7..25a6080ca08 100755
--- a/cluster/images/etcd/migrate-if-needed.sh
+++ b/cluster/images/etcd/migrate-if-needed.sh
@@ -18,7 +18,7 @@
 # This script performs etcd upgrade based on the following environmental
 # variables:
 # TARGET_STORAGE - API of etcd to be used (supported: 'etcd2', 'etcd3')
-# TARGET_VERSION - etcd release to be used (supported: '2.2.1', '2.3.7', '3.0.12')
+# TARGET_VERSION - etcd release to be used (supported: '2.2.1', '2.3.7', '3.0.13')
 # DATA_DIRECTORY - directory with etcd data
 #
 # The current etcd version and storage format is detected based on the
@@ -27,8 +27,8 @@
 #
 # The update workflow support the following upgrade steps:
 # - 2.2.1/etcd2 -> 2.3.7/etcd2
-# - 2.3.7/etcd2 -> 3.0.12/etcd2
-# - 3.0.12/etcd2 -> 3.0.12/etcd3
+# - 2.3.7/etcd2 -> 3.0.13/etcd2
+# - 3.0.13/etcd2 -> 3.0.13/etcd3
 #
 # NOTE: The releases supported in this script has to match release binaries
 # present in the etcd image (to make this script work correctly).
@@ -60,7 +60,7 @@ fi
 # NOTE: SUPPORTED_VERSION has to match release binaries present in the
 # etcd image (to make this script work correctly).
 # We cannot use array since sh doesn't support it.
-SUPPORTED_VERSIONS_STRING="2.2.1 2.3.7 3.0.12"
+SUPPORTED_VERSIONS_STRING="2.2.1 2.3.7 3.0.13"
 SUPPORTED_VERSIONS=$(echo "${SUPPORTED_VERSIONS_STRING}" | tr " " "\n")
 
 VERSION_FILE="version.txt"
diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh
index 83b80ffcb69..8c8033b2b9d 100644
--- a/hack/lib/etcd.sh
+++ b/hack/lib/etcd.sh
@@ -16,7 +16,7 @@
 
 # A set of helpers for starting/running etcd for tests
 
-ETCD_VERSION=${ETCD_VERSION:-3.0.10}
+ETCD_VERSION=${ETCD_VERSION:-3.0.13}
 ETCD_HOST=${ETCD_HOST:-127.0.0.1}
 ETCD_PORT=${ETCD_PORT:-2379}
 
diff --git a/hack/test-update-storage-objects.sh b/hack/test-update-storage-objects.sh
index e2c6bcb8bc0..4f2c3a0d72b 100755
--- a/hack/test-update-storage-objects.sh
+++ b/hack/test-update-storage-objects.sh
@@ -160,7 +160,7 @@ killApiServer
 
 kube::etcd::stop
 TARGET_STORAGE="etcd3" \
-  TARGET_VERSION="3.0.12" \
+  TARGET_VERSION="3.0.13" \
   DATA_DIRECTORY="${ETCD_DIR}" \
   ETCD=$(which etcd) \
   ETCDCTL=$(which etcdctl) \