diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile index 551133c3ec2..15cc0d17397 100644 --- a/build/build-image/cross/Dockerfile +++ b/build/build-image/cross/Dockerfile @@ -72,7 +72,7 @@ RUN mkdir $TMPDIR \ github.com/tools/godep # Download and symlink etcd. We need this for our integration tests. -RUN export ETCD_VERSION=v3.0.14; \ +RUN export ETCD_VERSION=v3.0.17; \ 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 0db7118eb58..973429b6939 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.7.5-1 +v1.7.5-2 diff --git a/cluster/images/etcd/migrate-if-needed.sh b/cluster/images/etcd/migrate-if-needed.sh index fbda6dc839e..04c57157a0e 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.14') +# TARGET_VERSION - etcd release to be used (supported: '2.2.1', '2.3.7', '3.0.17') # 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.14/etcd2 -# - 3.0.14/etcd2 -> 3.0.14/etcd3 +# - 2.3.7/etcd2 -> 3.0.17/etcd2 +# - 3.0.17/etcd2 -> 3.0.17/etcd3 # # NOTE: The releases supported in this script has to match release binaries # present in the etcd image (to make this script work correctly). @@ -68,7 +68,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.14" +SUPPORTED_VERSIONS_STRING="2.2.1 2.3.7 3.0.17" SUPPORTED_VERSIONS=$(echo "${SUPPORTED_VERSIONS_STRING}" | tr " " "\n") VERSION_FILE="version.txt" diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh index c2e9221cd2b..307fd52c3b8 100755 --- 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.14} +ETCD_VERSION=${ETCD_VERSION:-3.0.17} ETCD_HOST=${ETCD_HOST:-127.0.0.1} ETCD_PORT=${ETCD_PORT:-2379}