Merge pull request #6060 from ZJU-SEL/hotfix

[ubuntu-cluster] fix a serious bug when node both act as master and minion
kubernetes · Mar 27, 2015 · 308049e · 308049e
2 parents 41fbad2 + 88dca56
commit 308049e
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/cluster/ubuntu-cluster/configure.sh b/cluster/ubuntu-cluster/configure.sh
@@ -143,7 +143,6 @@ do
     mm[$i]=$name
     let ii++
 done
-echo 
 
 # input node IPs
 while true; do
@@ -168,7 +167,13 @@ while true; do
             sed -i "s/MASTER_IP/${masterIP}/g" default_scripts/kube-proxy        
 
             # For master set MINION IPs in kube-controller-manager
-	        minionIPs="$minionIPs,$myIP"
+            if [ -z "$minionIPs" ]; then
+                #one node act as both minion and master role
+                minionIPs="$myIP"
+            else
+                minionIPs="$minionIPs,$myIP"
+            fi
+
 	        sed -i "s/MINION_IPS/${minionIPs}/g" default_scripts/kube-controller-manager
 
 	        cpMaster