github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4769 from resouer/fix-mess

Browse Source 
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
parent 86434b4038 031e75a02d
commit 0bc98a75f4
2 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
cluster/ubuntu-cluster/configure.sh
View File

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

1
docs/getting-started-guides/README.md
View File

@@ -14,6 +14,7 @@ AWS | Saltstack | Ubuntu | [docs](../../docs/getting-started-guide
Vmware | CoreOS | CoreOS | [docs](../../docs/getting-started-guides/coreos.md) | Community (@kelseyhightower) | Vmware | CoreOS | CoreOS | [docs](../../docs/getting-started-guides/coreos.md) | Community (@kelseyhightower) |
Azure | Saltstack | Ubuntu | [docs](../../docs/getting-started-guides/azure.md) | Community (@jeffmendoza) | Azure | Saltstack | Ubuntu | [docs](../../docs/getting-started-guides/azure.md) | Community (@jeffmendoza) |
Bare-metal | custom | Ubuntu | [docs](../../docs/getting-started-guides/ubuntu_single_node.md) | Community (@jainvipin) | Bare-metal | custom | Ubuntu | [docs](../../docs/getting-started-guides/ubuntu_single_node.md) | Community (@jainvipin) |
Bare-metal | custom | Ubuntu Cluster | [docs](../../docs/getting-started-guides/ubuntu_multinodes_cluster.md) | community (@resouer @WIZARD-CXY) | use k8s version 0.10.1
Local | | | [docs](../../docs/getting-started-guides/locally.md) | Inactive | Local | | | [docs](../../docs/getting-started-guides/locally.md) | Inactive |
Ovirt | | | [docs](../../docs/getting-started-guides/ovirt.md) | Inactive | Ovirt | | | [docs](../../docs/getting-started-guides/ovirt.md) | Inactive |
Rackspace | CoreOS | CoreOS | [docs](../../docs/getting-started-guides/rackspace.md) | Inactive | Rackspace | CoreOS | CoreOS | [docs](../../docs/getting-started-guides/rackspace.md) | Inactive |