diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile index 8b7eceee955..60461a4a3bb 100644 --- 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.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 \ diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index d4bf38bf97e..c5e815804a5 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.6.3-5 +v1.6.3-6 diff --git a/cluster/centos/config-build.sh b/cluster/centos/config-build.sh index b033a0697ac..d46a25ff654 100755 --- a/cluster/centos/config-build.sh +++ b/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"} diff --git a/cluster/gce/coreos/kube-manifests/etcd-events.yaml b/cluster/gce/coreos/kube-manifests/etcd-events.yaml index 088da05ba19..7479b1a1b93 100644 --- a/cluster/gce/coreos/kube-manifests/etcd-events.yaml +++ b/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: diff --git a/cluster/gce/coreos/kube-manifests/etcd.yaml b/cluster/gce/coreos/kube-manifests/etcd.yaml index 08a4e5494d3..5c07614ed90 100644 --- a/cluster/gce/coreos/kube-manifests/etcd.yaml +++ b/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: diff --git a/cluster/images/hyperkube/static-pods/etcd.json b/cluster/images/hyperkube/static-pods/etcd.json index 5df87638d37..2f2d5598a08 100644 --- a/cluster/images/hyperkube/static-pods/etcd.json +++ b/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", diff --git a/cluster/saltbase/salt/etcd/etcd.manifest b/cluster/saltbase/salt/etcd/etcd.manifest index d3dd3c0ce9d..cbb4d4b1c9f 100644 --- a/cluster/saltbase/salt/etcd/etcd.manifest +++ b/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 }} diff --git a/cluster/saltbase/salt/flannel-server/flannel-server.manifest b/cluster/saltbase/salt/flannel-server/flannel-server.manifest index 95b46aafccd..c7d4acf44bf 100644 --- a/cluster/saltbase/salt/flannel-server/flannel-server.manifest +++ b/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", diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh index 578c4c56bdd..09962289503 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:-2.3.7} +ETCD_VERSION=${ETCD_VERSION:-2.2.1} 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 02ef84a1b23..9885aeacad3 100755 --- a/hack/test-update-storage-objects.sh +++ b/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 diff --git a/test/kubemark/start-kubemark-master.sh b/test/kubemark/start-kubemark-master.sh index 7667d93f48a..32938796ffc 100644 --- a/test/kubemark/start-kubemark-master.sh +++ b/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 \