mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Update test helpers and dev doc to use etcd v2.0.12.
This commit is contained in:
parent
28314c79ce
commit
fbd58294b2
@ -35,11 +35,12 @@ RUN rm -rf /var/lib/apt/lists/
|
||||
RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y rsync
|
||||
|
||||
# Download and symlink etcd. We need this for our integration tests.
|
||||
ENV ETCD_VERSION v2.0.12
|
||||
RUN mkdir -p /usr/local/src/etcd &&\
|
||||
cd /usr/local/src/etcd &&\
|
||||
curl -L -O -s https://github.com/coreos/etcd/releases/download/v2.0.0/etcd-v2.0.0-linux-amd64.tar.gz &&\
|
||||
tar xzf etcd-v2.0.0-linux-amd64.tar.gz &&\
|
||||
ln -s ../src/etcd/etcd-v2.0.0-linux-amd64/etcd /usr/local/bin/
|
||||
curl -fsSLO https://github.com/coreos/etcd/releases/download/$ETCD_VERSION/etcd-$ETCD_VERSION-linux-amd64.tar.gz &&\
|
||||
tar xzf etcd-$ETCD_VERSION-linux-amd64.tar.gz &&\
|
||||
ln -s ../src/etcd/etcd-$ETCD_VERSION-linux-amd64/etcd /usr/local/bin/
|
||||
|
||||
# Mark this as a kube-build container
|
||||
RUN touch /kube-build-image
|
||||
|
@ -20,7 +20,7 @@ set -o errexit
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
ETCD_VERSION=${ETCD_VERSION:-v2.0.11}
|
||||
ETCD_VERSION=${ETCD_VERSION:-v2.0.12}
|
||||
|
||||
full_name=etcd-${ETCD_VERSION}-linux-amd64
|
||||
archive_url=https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/${full_name}.tar.gz
|
||||
|
@ -264,7 +264,7 @@ Coverage results for the project can also be viewed on [Coveralls](https://cover
|
||||
|
||||
## Integration tests
|
||||
|
||||
You need an [etcd](https://github.com/coreos/etcd/releases/tag/v2.0.0) in your path, please make sure it is installed and in your ``$PATH``.
|
||||
You need an [etcd](https://github.com/coreos/etcd/releases/tag/v2.0.12) in your path, please make sure it is installed and in your ``$PATH``.
|
||||
|
||||
```sh
|
||||
cd kubernetes
|
||||
|
@ -20,9 +20,9 @@ set -o pipefail
|
||||
|
||||
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
|
||||
|
||||
ETCD_VERSION=${ETCD_VERSION:-v2.0.0}
|
||||
ETCD_VERSION=${ETCD_VERSION:-v2.0.12}
|
||||
|
||||
cd "${KUBE_ROOT}/third_party"
|
||||
curl -sL https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz \
|
||||
curl -fsSL https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz \
|
||||
| tar xzf -
|
||||
ln -sF etcd-${ETCD_VERSION}-linux-amd64 etcd
|
||||
ln -fns etcd-${ETCD_VERSION}-linux-amd64 etcd
|
||||
|
Loading…
Reference in New Issue
Block a user