diff --git a/cluster/ubuntu/config-default.sh b/cluster/ubuntu/config-default.sh index eb59dc242b2..ec63f7650fb 100755 --- a/cluster/ubuntu/config-default.sh +++ b/cluster/ubuntu/config-default.sh @@ -34,8 +34,6 @@ export SERVICE_CLUSTER_IP_RANGE=${SERVICE_CLUSTER_IP_RANGE:-192.168.3.0/24} # f # define the IP range used for flannel overlay network, should not conflict with above SERVICE_CLUSTER_IP_RANGE export FLANNEL_NET=${FLANNEL_NET:-172.16.0.0/16} -export FLANNEL_OPTS=${FLANNEL_OPTS:-"Network": 172.16.0.0/16} - # Admission Controllers to invoke prior to persisting objects in cluster export ADMISSION_CONTROL=NamespaceLifecycle,NamespaceExists,LimitRanger,ServiceAccount,ResourceQuota,SecurityContextDeny diff --git a/cluster/ubuntu/util.sh b/cluster/ubuntu/util.sh index d04cd0c02e4..1145a02bb93 100755 --- a/cluster/ubuntu/util.sh +++ b/cluster/ubuntu/util.sh @@ -400,7 +400,7 @@ function provision-minion() { sudo -p '[sudo] password to copy files and start minion: ' cp ~/kube/default/* /etc/default/ && sudo cp ~/kube/init_conf/* /etc/init/ && sudo cp ~/kube/init_scripts/* /etc/init.d/ \ && sudo mkdir -p /opt/bin/ && sudo cp ~/kube/minion/* /opt/bin; \ sudo service etcd start; \ - sudo -b ~/kube/reconfDocker.sh" + sudo FLANNEL_NET=${FLANNEL_NET} -b ~/kube/reconfDocker.sh" } function provision-masterandminion() { @@ -425,7 +425,7 @@ function provision-masterandminion() { sudo ~/kube/make-ca-cert.sh ${MASTER_IP} IP:${MASTER_IP},IP:${SERVICE_CLUSTER_IP_RANGE%.*}.1,DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local; \ sudo mkdir -p /opt/bin/ && sudo cp ~/kube/master/* /opt/bin/ && sudo cp ~/kube/minion/* /opt/bin/; \ sudo service etcd start; \ - sudo -b ~/kube/reconfDocker.sh" + sudo FLANNEL_NET=${FLANNEL_NET} -b ~/kube/reconfDocker.sh" } # Delete a kubernetes cluster