github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #18008 from ZJU-SEL/multi-nic 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-12-05 05:50:33 -08:00
parent 2f4d4d9e94 cab6c13ea2
commit ffd5725690
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cluster/ubuntu/util.sh
View File

@ -255,7 +255,8 @@ EOF
function create-flanneld-opts() { function create-flanneld-opts() {
cat <<EOF > ~/kube/default/flanneld cat <<EOF > ~/kube/default/flanneld
FLANNEL_OPTS="--etcd-endpoints=http://${1}:4001" FLANNEL_OPTS="--etcd-endpoints=http://${1}:4001 \
--iface=${2}"
EOF EOF
} }
@ -384,7 +385,7 @@ function provision-master() {
'${SERVICE_NODE_PORT_RANGE}' '${SERVICE_NODE_PORT_RANGE}'
create-kube-controller-manager-opts '${NODE_IPS}' create-kube-controller-manager-opts '${NODE_IPS}'
create-kube-scheduler-opts create-kube-scheduler-opts
create-flanneld-opts '127.0.0.1' create-flanneld-opts '127.0.0.1' '${MASTER_IP}'
sudo -E -p '[sudo] password to start master: ' -- /bin/bash -c ' sudo -E -p '[sudo] password to start master: ' -- /bin/bash -c '
cp ~/kube/default/* /etc/default/ cp ~/kube/default/* /etc/default/
cp ~/kube/init_conf/* /etc/init/ cp ~/kube/init_conf/* /etc/init/
@ -428,9 +429,9 @@ function provision-node() {
'${DNS_SERVER_IP}' \ '${DNS_SERVER_IP}' \
'${DNS_DOMAIN}' '${DNS_DOMAIN}'
create-kube-proxy-opts \ create-kube-proxy-opts \
'${1#*@}' \ '${1#*@}' \
'${MASTER_IP}' '${MASTER_IP}'
create-flanneld-opts '${MASTER_IP}' create-flanneld-opts '${MASTER_IP}' '${1#*@}'
sudo -E -p '[sudo] password to start node: ' -- /bin/bash -c ' sudo -E -p '[sudo] password to start node: ' -- /bin/bash -c '
cp ~/kube/default/* /etc/default/ cp ~/kube/default/* /etc/default/
@ -494,9 +495,9 @@ function provision-masterandnode() {
'${DNS_SERVER_IP}' \ '${DNS_SERVER_IP}' \
'${DNS_DOMAIN}' '${DNS_DOMAIN}'
create-kube-proxy-opts \ create-kube-proxy-opts \
'${MASTER_IP}' \ '${MASTER_IP}' \
'${MASTER_IP}' '${MASTER_IP}'
create-flanneld-opts '127.0.0.1' create-flanneld-opts '127.0.0.1' '${MASTER_IP}'
sudo -E -p '[sudo] password to start master: ' -- /bin/bash -c ' sudo -E -p '[sudo] password to start master: ' -- /bin/bash -c '
cp ~/kube/default/* /etc/default/ cp ~/kube/default/* /etc/default/