Merge pull request #36232 from wojtek-t/cherrypick_etcd3

Automatic merge from submit-queue Cherrypick etcd3 changes Ref #20504 From production pov, this PR is supposed to be no-op (since we are not switching the defaults still).
kubernetes · Nov 8, 2016 · ece834b · ece834b
2 parents 28e092e + 1148b30
commit ece834b
Show file tree

Hide file tree

Showing 23 changed files with 406 additions and 221 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/build/build-image/cross/Dockerfile b/build/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=v2.2.1; \
+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/build-image/cross/VERSION b/build/build-image/cross/VERSION
@@ -1 +1 @@
-v1.6.3-8
+v1.6.3-9