From 76f115a8ee6115d7e001248969a5d6e5c6765caf Mon Sep 17 00:00:00 2001
From: Wojciech Tyczynski <wojtekt@google.com>
Date: Thu, 3 Nov 2016 12:05:39 +0100
Subject: [PATCH] Bump etcd to 3.0.14

---
 cluster/saltbase/salt/etcd/etcd.manifest | 4 ++--
 test/kubemark/start-kubemark.sh          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cluster/saltbase/salt/etcd/etcd.manifest b/cluster/saltbase/salt/etcd/etcd.manifest
index ced139e64c0..5522fef8984 100644
--- a/cluster/saltbase/salt/etcd/etcd.manifest
+++ b/cluster/saltbase/salt/etcd/etcd.manifest
@@ -39,7 +39,7 @@
 "containers":[
     {
     "name": "etcd-container",
-    "image": "gcr.io/google_containers/etcd:{{ pillar.get('etcd_docker_tag', '2.2.1') }}",
+    "image": "gcr.io/google_containers/etcd:{{ pillar.get('etcd_docker_tag', '3.0.14-alpha.1') }}",
     "resources": {
       "requests": {
         "cpu": {{ cpulimit }}
@@ -55,7 +55,7 @@
         "value": "{{ storage_backend }}"
       },
       { "name": "TARGET_VERSION",
-        "value": "{{ pillar.get('etcd_version', '2.2.1') }}"
+        "value": "{{ pillar.get('etcd_version', '3.0.14') }}"
       },
       { "name": "DATA_DIRECTORY",
         "value": "/var/etcd/data{{ suffix }}"
diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh
index c57bfd7c9ce..df8e107b820 100755
--- a/test/kubemark/start-kubemark.sh
+++ b/test/kubemark/start-kubemark.sh
@@ -29,7 +29,7 @@ INSTANCE_PREFIX="${INSTANCE_PREFIX:-}"
 SERVICE_CLUSTER_IP_RANGE="${SERVICE_CLUSTER_IP_RANGE:-}"
 
 # Etcd related variables.
-ETCD_IMAGE="${ETCD_IMAGE:-2.2.1}"
+ETCD_IMAGE="${ETCD_IMAGE:-3.0.14-alpha.1}"
 ETCD_VERSION="${ETCD_VERSION:-}"
 
 # Controller-manager related variables.