scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 11:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to shift etcd 2.2 references to use 3.0.3

Browse Source
This commit is contained in:
Timothy St. Clair
2016-07-21 15:00:44 -05:00
parent 301be4eeb5
commit 456c43c22d
11 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e_node/environment/setup_host.sh
View File

@@ -55,11 +55,11 @@ fi
# Install etcd
hash etcd 2>/dev/null
if [ $? -ne 0 ]; then
curl -L https://github.com/coreos/etcd/releases/download/v2.2.5/etcd-v2.2.5-linux-amd64.tar.gz -o etcd-v2.2.5-linux-amd64.tar.gz
tar xzvf etcd-v2.2.5-linux-amd64.tar.gz
sudo mv etcd-v2.2.5-linux-amd64/etcd* /usr/local/bin/
curl -L https://github.com/coreos/etcd/releases/download/v3.0.3/etcd-v3.0.3-linux-amd64.tar.gz -o etcd-v3.0.3-linux-amd64.tar.gz
tar xzvf etcd-v3.0.3-linux-amd64.tar.gz
sudo mv etcd-v3.0.3-linux-amd64/etcd* /usr/local/bin/
sudo chown root:root /usr/local/bin/etcd*
rm -r etcd-v2.2.5-linux-amd64*
rm -r etcd-v3.0.3-linux-amd64*
fi
# Install nsenter for ubuntu images

2
test/e2e_node/jenkins/gci-init.yaml
View File

@@ -2,7 +2,7 @@
runcmd:
- mount /tmp /tmp -o remount,exec,suid
- ETCD_VERSION=v2.2.5
- ETCD_VERSION=v3.0.3
- curl -L https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz -o /tmp/etcd.tar.gz
- tar xzvf /tmp/etcd.tar.gz -C /tmp
- cp /tmp/etcd-${ETCD_VERSION}-linux-amd64/etcd* /tmp/

4
test/kubemark/start-kubemark-master.sh
View File

@@ -20,14 +20,14 @@ EVENT_STORE_IP=$1
EVENT_STORE_URL="http://${EVENT_STORE_IP}:4002"
NUM_NODES=$2
if [ "${EVENT_STORE_IP}" == "127.0.0.1" ]; then
sudo docker run --net=host -d gcr.io/google_containers/etcd:2.2.1 /usr/local/bin/etcd \
sudo docker run --net=host -d gcr.io/google_containers/etcd:3.0.3 /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 \
--data-dir=/var/etcd/data
fi
sudo docker run --net=host -d gcr.io/google_containers/etcd:2.2.1 /usr/local/bin/etcd \
sudo docker run --net=host -d gcr.io/google_containers/etcd:3.0.3 /usr/local/bin/etcd \
--listen-peer-urls http://127.0.0.1:2380 \
--advertise-client-urls=http://127.0.0.1:4001 \
--listen-client-urls=http://0.0.0.0:4001 \