Merge pull request #4769 from resouer/fix-mess

Fix commands order & add guide in k8s-ubuntu-cluster readme
This commit is contained in:
Rohit Jnagal
2015-02-25 06:40:19 -08:00
2 changed files with 30 additions and 26 deletions

View File

@@ -153,45 +153,48 @@ while true; do
echo
case $option in
[2] )
[1] )
# as both master and minion
read -p "IP address of this machine > " myIP
echo
etcdName=${mm[$myIP]}
inList $etcdName $myIP
configEtcd $etcdName $myIP $cluster
# set MINION IPs in kube-controller-manager
sed -i "s/MINION_IPS/${minionIPs}/g" default_scripts/kube-controller-manager
cpMaster
break
;;
[3] )
read -p "IP address of this machine > " myIP
echo
etcdName=${mm[$myIP]}
inList $etcdName $myIP
configEtcd $etcdName $myIP $cluster
# set MINION IP in default_scripts/kubelet
sed -i "s/MY_IP/${myIP}/g" default_scripts/kubelet
cpMinion
break
;;
[1] )
read -p "IP address of this machine > " myIP
echo
etcdName=${mm[$myIP]}
inList $etcdName $myIP
inList $etcdName $myIP
configEtcd $etcdName $myIP $cluster
# For minion set MINION IP in default_scripts/kubelet
sed -i "s/MY_IP/${myIP}/g" default_scripts/kubelet
sed -i "s/MY_IP/${myIP}/g" default_scripts/kubelet
# For master set MINION IPs in kube-controller-manager
minionIPs="$minionIPs,$myIP"
minionIPs="$minionIPs,$myIP"
sed -i "s/MINION_IPS/${minionIPs}/g" default_scripts/kube-controller-manager
cpMaster
cpMinion
break
;;
[2] )
# as master
read -p "IP address of this machine > " myIP
echo
etcdName=${mm[$myIP]}
inList $etcdName $myIP
configEtcd $etcdName $myIP $cluster
# set MINION IPs in kube-controller-manager
sed -i "s/MINION_IPS/${minionIPs}/g" default_scripts/kube-controller-manager
cpMaster
break
;;
[3] )
# as minion
read -p "IP address of this machine > " myIP
echo
etcdName=${mm[$myIP]}
inList $etcdName $myIP
configEtcd $etcdName $myIP $cluster
# set MINION IP in default_scripts/kubelet
sed -i "s/MY_IP/${myIP}/g" default_scripts/kubelet
cpMinion
break
;;
* )
echo "Please choose 1 or 2 or 3."
;;