From 2916101a994849b506816aa88772ab00c5abb94d Mon Sep 17 00:00:00 2001 From: Arsen Mamikonyan Date: Tue, 28 Jul 2015 12:21:37 -0700 Subject: [PATCH] Propagate FLANNEL_NET to reconfDocker.sh if it was set using environment variable --- cluster/ubuntu/config-default.sh | 2 -- cluster/ubuntu/util.sh | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cluster/ubuntu/config-default.sh b/cluster/ubuntu/config-default.sh index c31ad7842d7..e1e3624605f 100755 --- a/cluster/ubuntu/config-default.sh +++ b/cluster/ubuntu/config-default.sh @@ -33,8 +33,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,NamespaceAutoProvision,LimitRanger,ServiceAccount,ResourceQuota diff --git a/cluster/ubuntu/util.sh b/cluster/ubuntu/util.sh index f711bfbaf5d..ff1ff093b99 100755 --- a/cluster/ubuntu/util.sh +++ b/cluster/ubuntu/util.sh @@ -399,7 +399,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() { @@ -424,7 +424,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