github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages 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
Download Patch File Download Diff File Expand all files Collapse all files

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"}
# Define etcd version to use.
ETCD_VERSION=${ETCD_VERSION:-"2.3.7"}
ETCD_VERSION=${ETCD_VERSION:-"2.2.1"}
# Define k8s version to use.
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
--data-dir=/var/etcd/data-events
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
livenessProbe:
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
--data-dir=/var/etcd/data
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
livenessProbe:
httpGet:

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

@@ -10,7 +10,7 @@
"containers": [
{
"name": "etcd",
"image": "gcr.io/google_containers/etcd-ARCH:2.3.7",
"image": "gcr.io/google_containers/etcd-ARCH:2.2.1",
"command": [
"/usr/local/bin/etcd",
"--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":[
{
"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": {
"requests": {
"cpu": {{ cpulimit }}

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

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