From b34ac6baefb1760b17d6da610a9f7378eed48ecd Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Mon, 7 Nov 2016 08:40:08 +0100 Subject: [PATCH] Bump etcd to 3.0.14 in tests --- build-tools/build-image/cross/Dockerfile | 2 +- build-tools/build-image/cross/VERSION | 2 +- cluster/gce/config-test.sh | 2 +- cluster/images/etcd/Makefile | 6 +++--- cluster/images/etcd/migrate-if-needed.sh | 8 ++++---- cluster/kubemark/config-default.sh | 2 +- hack/lib/etcd.sh | 2 +- hack/test-update-storage-objects.sh | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build-tools/build-image/cross/Dockerfile b/build-tools/build-image/cross/Dockerfile index 749bf3bf7f1..018a2771368 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.13; \ +RUN export ETCD_VERSION=v3.0.14; \ 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 08acdfb9caf..3616fe13ad7 100644 --- a/build-tools/build-image/cross/VERSION +++ b/build-tools/build-image/cross/VERSION @@ -1 +1 @@ -v1.7.1-2 +v1.7.1-3 diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index c6dfa863ce5..fff59511236 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -94,7 +94,7 @@ ENABLE_L7_LOADBALANCING="${KUBE_ENABLE_L7_LOADBALANCING:-glbc}" # standalone - Heapster only. Metrics available via Heapster REST API. ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-influxdb}" -# Set etcd image (e.g. 3.0.13-experimental.1) version (e.g. 3.0.13) if you need +# Set etcd image (e.g. 3.0.14-experimental.1) version (e.g. 3.0.14) if you need # non-default version. ETCD_IMAGE="${TEST_ETCD_IMAGE:-}" ETCD_VERSION="${TEST_ETCD_VERSION:-}" diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index b37270fa8b0..7859f6148a8 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.13] [REGISTRY=gcr.io/google_containers] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push) +# [TAGS=2.2.1 2.3.7 3.0.14] [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.13 -REGISTRY_TAG?=3.0.13 +TAGS?=2.2.1 2.3.7 3.0.14 +REGISTRY_TAG?=3.0.14 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 5b262837138..3f542b71e2c 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.13') +# TARGET_VERSION - etcd release to be used (supported: '2.2.1', '2.3.7', '3.0.14') # 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.13/etcd2 -# - 3.0.13/etcd2 -> 3.0.13/etcd3 +# - 2.3.7/etcd2 -> 3.0.14/etcd2 +# - 3.0.14/etcd2 -> 3.0.14/etcd3 # # NOTE: The releases supported in this script has to match release binaries # present in the etcd image (to make this script work correctly). @@ -66,7 +66,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.13" +SUPPORTED_VERSIONS_STRING="2.2.1 2.3.7 3.0.14" SUPPORTED_VERSIONS=$(echo "${SUPPORTED_VERSIONS_STRING}" | tr " " "\n") VERSION_FILE="version.txt" diff --git a/cluster/kubemark/config-default.sh b/cluster/kubemark/config-default.sh index c29398d7219..d4c2a195dea 100644 --- a/cluster/kubemark/config-default.sh +++ b/cluster/kubemark/config-default.sh @@ -46,7 +46,7 @@ CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.240.0.0/11}" RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}" TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100} -# Set etcd image (e.g. 3.0.13-experimental.1) version (e.g. 3.0.13) if you need +# Set etcd image (e.g. 3.0.14-experimental.1) version (e.g. 3.0.14) if you need # non-default version. ETCD_IMAGE="${TEST_ETCD_IMAGE:-}" ETCD_VERSION="${TEST_ETCD_VERSION:-}" diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh index 8c8033b2b9d..b32f2113e28 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.13} +ETCD_VERSION=${ETCD_VERSION:-3.0.14} 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 aa3d9d247f5..acdf63095d9 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.13" \ + TARGET_VERSION="3.0.14" \ DATA_DIRECTORY="${ETCD_DIR}" \ ETCD=$(which etcd) \ ETCDCTL=$(which etcdctl) \