Merge pull request #31206 from GregoryIan/patch-1

Automatic merge from submit-queue

remove NODE_IPS
This commit is contained in:
Kubernetes Submit Queue 2016-10-13 23:51:06 -07:00 committed by GitHub
commit 6c4d1244bc

View File

@ -479,7 +479,7 @@ function provision-master() {
'${SERVICE_NODE_PORT_RANGE}' \
'${MASTER_IP}' \
'${ALLOW_PRIVILEGED}'
create-kube-controller-manager-opts '${NODE_IPS}'
create-kube-controller-manager-opts
create-kube-scheduler-opts
create-flanneld-opts '127.0.0.1' '${MASTER_IP}'
FLANNEL_OTHER_NET_CONFIG='${FLANNEL_OTHER_NET_CONFIG}' sudo -E -p '[sudo] password to start master: ' -- /bin/bash -ce '
@ -653,7 +653,7 @@ function provision-masterandnode() {
'${SERVICE_NODE_PORT_RANGE}' \
'${MASTER_IP}' \
'${ALLOW_PRIVILEGED}'
create-kube-controller-manager-opts '${NODE_IPS}'
create-kube-controller-manager-opts
create-kube-scheduler-opts
create-kubelet-opts \
'${MASTER_IP}' \