stick to 2.2.1 etcd

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.3.7; \
+RUN export ETCD_VERSION=v2.2.1; \
   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 \

build/build-image/cross/VERSION

@@ -1 +1 @@
-v1.6.3-5
+v1.6.3-6

cluster/centos/config-build.sh

@@ -23,7 +23,7 @@ RELEASES_DIR=${RELEASES_DIR:-/tmp/downloads}
 FLANNEL_VERSION=${FLANNEL_VERSION:-"0.5.5"}
 
 # Define etcd version to use.
-ETCD_VERSION=${ETCD_VERSION:-"2.3.7"}
+ETCD_VERSION=${ETCD_VERSION:-"2.2.1"}
 
 # Define k8s version to use.
 K8S_VERSION=${K8S_VERSION:-"1.1.1"}

cluster/gce/coreos/kube-manifests/etcd-events.yaml

@@ -14,7 +14,7 @@ spec:
       --listen-client-urls=http://127.0.0.1:4002
       --data-dir=/var/etcd/data-events
       1>>/var/log/etcd-events.log 2>&1
-    image: gcr.io/google_containers/etcd:2.3.7
+    image: gcr.io/google_containers/etcd:2.2.1
     imagePullPolicy: IfNotPresent
     livenessProbe:
       httpGet:

cluster/gce/coreos/kube-manifests/etcd.yaml

@@ -14,7 +14,7 @@ spec:
       --listen-client-urls=http://127.0.0.1:2379
       --data-dir=/var/etcd/data
       1>>/var/log/etcd.log 2>&1
-    image: gcr.io/google_containers/etcd:2.3.7
+    image: gcr.io/google_containers/etcd:2.2.1
     imagePullPolicy: IfNotPresent
     livenessProbe:
       httpGet:

cluster/images/hyperkube/static-pods/etcd.json

@@ -10,7 +10,7 @@
     "containers": [
       {
         "name": "etcd",
-        "image": "gcr.io/google_containers/etcd-ARCH:2.3.7",
+        "image": "gcr.io/google_containers/etcd-ARCH:2.2.1",
         "command": [
           "/usr/local/bin/etcd",
           "--listen-client-urls=http://127.0.0.1:2379,http://127.0.0.1:4001",

cluster/saltbase/salt/etcd/etcd.manifest

@@ -28,7 +28,7 @@
 "containers":[
     {
     "name": "etcd-container",
-    "image": "gcr.io/google_containers/etcd:{{ pillar.get('etcd_docker_tag', '2.3.7') }}",
+    "image": "gcr.io/google_containers/etcd:{{ pillar.get('etcd_docker_tag', '2.2.1') }}",
     "resources": {
       "requests": {
         "cpu": {{ cpulimit }}

cluster/saltbase/salt/flannel-server/flannel-server.manifest

@@ -75,7 +75,7 @@
             },
             {
                 "name": "etcd-container",
-                "image": "gcr.io/google_containers/etcd:2.3.7",
+                "image": "gcr.io/google_containers/etcd:2.2.1",
                 "command": [
                     "/bin/sh",
                     "-c",

hack/lib/etcd.sh

@@ -16,7 +16,7 @@
 
 # A set of helpers for starting/running etcd for tests
 
-ETCD_VERSION=${ETCD_VERSION:-2.3.7}
+ETCD_VERSION=${ETCD_VERSION:-2.2.1}
 ETCD_HOST=${ETCD_HOST:-127.0.0.1}
 ETCD_PORT=${ETCD_PORT:-2379}
 

hack/test-update-storage-objects.sh

@@ -192,7 +192,8 @@ for test in ${tests[@]}; do
   new_storage_version=${test_data[5]}
 
   kube::log::status "Verifying ${resource}/${namespace}/${name} has updated storage version ${new_storage_version} in etcd"
-  ${ETCDCTL} --endpoints="${ETCD_HOST}:${ETCD_PORT}" get "/${ETCD_PREFIX}/${resource}/${namespace}/${name}" | grep ${new_storage_version}
+  # note that should use flag --endpoints for etcdctl 3
+  ${ETCDCTL} --endpoint="${ETCD_HOST}:${ETCD_PORT}" get "/${ETCD_PREFIX}/${resource}/${namespace}/${name}" | grep ${new_storage_version}
 done
 
 killApiServer

test/kubemark/start-kubemark-master.sh

@@ -31,7 +31,7 @@ if [ "${EVENT_STORE_IP}" == "127.0.0.1" ]; then
 	# Retry starting etcd to avoid pulling image errors.
 	retry sudo docker run --net=host \
 		-v /var/etcd/data-events:/var/etcd/data -v /var/log:/var/log -d \
-		gcr.io/google_containers/etcd:2.3.7 /bin/sh -c "/usr/local/bin/etcd \
+		gcr.io/google_containers/etcd:2.2.1 /bin/sh -c "/usr/local/bin/etcd \
 		--listen-peer-urls http://127.0.0.1:2381 \
 		--advertise-client-urls=http://127.0.0.1:4002 \
 		--listen-client-urls=http://0.0.0.0:4002 \
@@ -41,7 +41,7 @@ fi
 # Retry starting etcd to avoid pulling image errors.
 retry sudo docker run --net=host \
 	-v /var/etcd/data:/var/etcd/data -v /var/log:/var/log -d \
-	gcr.io/google_containers/etcd:2.3.7 /bin/sh -c "/usr/local/bin/etcd \
+	gcr.io/google_containers/etcd:2.2.1 /bin/sh -c "/usr/local/bin/etcd \
 	--listen-peer-urls http://127.0.0.1:2380 \
 	--advertise-client-urls=http://127.0.0.1:2379 \
 	--listen-client-urls=http://0.0.0.0:2379 \