github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-16 22:53:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17419 from ZJU-SEL/fix-ubuntu-etcd-flag

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-11-23 03:19:17 -08:00
parent 147b6911f5 5ebff99dbf
commit 2371cdaac4
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
ETCD_OPTS="\
-name infra\
-listen-client-urls http://0.0.0.0:4001\
-advertise-client-urls http://127.0.0.1:4001"
-listen-client-urls http://127.0.0.1:4001,http://${1}:4001\
-advertise-client-urls http://${1}:4001"
EOF
}
@@ -379,7 +379,7 @@ function provision-master() {
source ~/kube/util.sh
setClusterInfo
create-etcd-opts
create-etcd-opts '${MASTER_IP}'
create-kube-apiserver-opts \
'${SERVICE_CLUSTER_IP_RANGE}' \
'${ADMISSION_CONTROL}' \
@@ -481,7 +481,7 @@ function provision-masterandnode() {
source ~/kube/util.sh
setClusterInfo
create-etcd-opts
create-etcd-opts '${MASTER_IP}'
create-kube-apiserver-opts \
'${SERVICE_CLUSTER_IP_RANGE}' \
'${ADMISSION_CONTROL}' \