github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

stick to 2.2.1 etcd

Browse Source
This commit is contained in:
Chao Xu 2016-09-09 11:23:46 -07:00
parent 1d0404466d
commit 7e92025cfd
11 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/build-image/cross/Dockerfile
View File

@ -72,7 +72,7 @@ RUN mkdir $TMPDIR \
github.com/jteeuwen/go-bindata/go-bindata github.com/jteeuwen/go-bindata/go-bindata
# Download and symlink etcd. We need this for our integration tests. # 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 \ mkdir -p /usr/local/src/etcd \
&& cd /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 \ && curl -fsSL https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz | tar -xz \

2
build/build-image/cross/VERSION
View File

@ -1 +1 @@
v1.6.3-5 v1.6.3-6

2
cluster/centos/config-build.sh
View File

@ -23,7 +23,7 @@ RELEASES_DIR=${RELEASES_DIR:-/tmp/downloads}
FLANNEL_VERSION=${FLANNEL_VERSION:-"0.5.5"} FLANNEL_VERSION=${FLANNEL_VERSION:-"0.5.5"}
# Define etcd version to use. # Define etcd version to use.
ETCD_VERSION=${ETCD_VERSION:-"2.3.7"} ETCD_VERSION=${ETCD_VERSION:-"2.2.1"}
# Define k8s version to use. # Define k8s version to use.
K8S_VERSION=${K8S_VERSION:-"1.1.1"} K8S_VERSION=${K8S_VERSION:-"1.1.1"}

2
cluster/gce/coreos/kube-manifests/etcd-events.yaml
View File

@ -14,7 +14,7 @@ spec:
--listen-client-urls=http://127.0.0.1:4002 --listen-client-urls=http://127.0.0.1:4002
--data-dir=/var/etcd/data-events --data-dir=/var/etcd/data-events
1>>/var/log/etcd-events.log 2>&1 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 imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:
httpGet: httpGet:

2
cluster/gce/coreos/kube-manifests/etcd.yaml
View File

@ -14,7 +14,7 @@ spec:
--listen-client-urls=http://127.0.0.1:2379 --listen-client-urls=http://127.0.0.1:2379
--data-dir=/var/etcd/data --data-dir=/var/etcd/data
1>>/var/log/etcd.log 2>&1 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 imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:
httpGet: httpGet:

2
cluster/images/hyperkube/static-pods/etcd.json
View File

@ -10,7 +10,7 @@
"containers": [ "containers": [
{ {
"name": "etcd", "name": "etcd",
"image": "gcr.io/google_containers/etcd-ARCH:2.3.7", "image": "gcr.io/google_containers/etcd-ARCH:2.2.1",
"command": [ "command": [
"/usr/local/bin/etcd", "/usr/local/bin/etcd",
"--listen-client-urls=http://127.0.0.1:2379,http://127.0.0.1:4001", "--listen-client-urls=http://127.0.0.1:2379,http://127.0.0.1:4001",

2
cluster/saltbase/salt/etcd/etcd.manifest
View File

@ -28,7 +28,7 @@
"containers":[ "containers":[
{ {
"name": "etcd-container", "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": { "resources": {
"requests": { "requests": {
"cpu": {{ cpulimit }} "cpu": {{ cpulimit }}

2
cluster/saltbase/salt/flannel-server/flannel-server.manifest
View File

@ -75,7 +75,7 @@
}, },
{ {
"name": "etcd-container", "name": "etcd-container",
"image": "gcr.io/google_containers/etcd:2.3.7", "image": "gcr.io/google_containers/etcd:2.2.1",
"command": [ "command": [
"/bin/sh", "/bin/sh",
"-c", "-c",

2
hack/lib/etcd.sh
View File

@ -16,7 +16,7 @@
# A set of helpers for starting/running etcd for tests # 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_HOST=${ETCD_HOST:-127.0.0.1}
ETCD_PORT=${ETCD_PORT:-2379} ETCD_PORT=${ETCD_PORT:-2379}

3
hack/test-update-storage-objects.sh
View File

@ -192,7 +192,8 @@ for test in ${tests[@]}; do
new_storage_version=${test_data[5]} new_storage_version=${test_data[5]}
kube::log::status "Verifying ${resource}/${namespace}/${name} has updated storage version ${new_storage_version} in etcd" 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 done
killApiServer killApiServer

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

@ -31,7 +31,7 @@ if [ "${EVENT_STORE_IP}" == "127.0.0.1" ]; then
# Retry starting etcd to avoid pulling image errors. # Retry starting etcd to avoid pulling image errors.
retry sudo docker run --net=host \ retry sudo docker run --net=host \
-v /var/etcd/data-events:/var/etcd/data -v /var/log:/var/log -d \ -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 \ --listen-peer-urls http://127.0.0.1:2381 \
--advertise-client-urls=http://127.0.0.1:4002 \ --advertise-client-urls=http://127.0.0.1:4002 \
--listen-client-urls=http://0.0.0.0:4002 \ --listen-client-urls=http://0.0.0.0:4002 \
@ -41,7 +41,7 @@ fi
# Retry starting etcd to avoid pulling image errors. # Retry starting etcd to avoid pulling image errors.
retry sudo docker run --net=host \ retry sudo docker run --net=host \
-v /var/etcd/data:/var/etcd/data -v /var/log:/var/log -d \ -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 \ --listen-peer-urls http://127.0.0.1:2380 \
--advertise-client-urls=http://127.0.0.1:2379 \ --advertise-client-urls=http://127.0.0.1:2379 \
--listen-client-urls=http://0.0.0.0:2379 \ --listen-client-urls=http://0.0.0.0:2379 \