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

fix etcd flag for ubuntu

Browse Source
This commit is contained in:
He Simei
2015-11-18 16:03:50 +08:00
parent d069a624ac
commit 5ebff99dbf
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/ubuntu/util.sh
View File

@@ -188,8 +188,8 @@ function create-etcd-opts() {
cat <<EOF > ~/kube/default/etcd cat <<EOF > ~/kube/default/etcd
ETCD_OPTS="\ ETCD_OPTS="\
-name infra\ -name infra\
-listen-client-urls http://0.0.0.0:4001\ -listen-client-urls http://127.0.0.1:4001,http://${1}:4001\
-advertise-client-urls http://127.0.0.1:4001" -advertise-client-urls http://${1}:4001"
EOF EOF
} }
@@ -379,7 +379,7 @@ function provision-master() {
source ~/kube/util.sh source ~/kube/util.sh
setClusterInfo setClusterInfo
create-etcd-opts create-etcd-opts '${MASTER_IP}'
create-kube-apiserver-opts \ create-kube-apiserver-opts \
'${SERVICE_CLUSTER_IP_RANGE}' \ '${SERVICE_CLUSTER_IP_RANGE}' \
'${ADMISSION_CONTROL}' \ '${ADMISSION_CONTROL}' \
@@ -481,7 +481,7 @@ function provision-masterandnode() {
source ~/kube/util.sh source ~/kube/util.sh
setClusterInfo setClusterInfo
create-etcd-opts create-etcd-opts '${MASTER_IP}'
create-kube-apiserver-opts \ create-kube-apiserver-opts \
'${SERVICE_CLUSTER_IP_RANGE}' \ '${SERVICE_CLUSTER_IP_RANGE}' \
'${ADMISSION_CONTROL}' \ '${ADMISSION_CONTROL}' \

2
docs/getting-started-guides/docker-multinode/master.md
View File

@@ -70,7 +70,7 @@ across reboots and failures.
Run: Run:
```sh ```sh
sudo docker -H unix:///var/run/docker-bootstrap.sock run --net=host -d gcr.io/google_containers/etcd:2.2.1 /usr/local/bin/etcd --listen-client-urls=http://127.0.0.1:4001,http://${MASTER_IP}:4001 --advertise-client-urls=http://127.0.0.1:4001,http://${MASTER_IP}:4001 --data-dir=/var/etcd/data sudo docker -H unix:///var/run/docker-bootstrap.sock run --net=host -d gcr.io/google_containers/etcd:2.2.1 /usr/local/bin/etcd --listen-client-urls=http://127.0.0.1:4001,http://${MASTER_IP}:4001 --advertise-client-urls=http://${MASTER_IP}:4001 --data-dir=/var/etcd/data
``` ```
Next, you need to set a CIDR range for flannel. This CIDR should be chosen to be non-overlapping with any existing network you are using: Next, you need to set a CIDR range for flannel. This CIDR should be chosen to be non-overlapping with any existing network you are using:

2
docs/getting-started-guides/docker-multinode/master.sh
View File

@@ -121,7 +121,7 @@ start_k8s(){
gcr.io/google_containers/etcd:2.2.1 \ gcr.io/google_containers/etcd:2.2.1 \
/usr/local/bin/etcd \ /usr/local/bin/etcd \
--listen-client-urls=http://127.0.0.1:4001,http://${MASTER_IP}:4001 \ --listen-client-urls=http://127.0.0.1:4001,http://${MASTER_IP}:4001 \
--advertise-client-urls=http://127.0.0.1:4001,http://${MASTER_IP}:4001 --advertise-client-urls=http://${MASTER_IP}:4001
--data-dir=/var/etcd/data --data-dir=/var/etcd/data
sleep 5 sleep 5