From 282b1be1880b3005f0cb2fb20a976e36c0e8efa3 Mon Sep 17 00:00:00 2001 From: wizard Date: Fri, 6 Mar 2015 10:52:28 +0800 Subject: [PATCH 1/3] update getting-started-guided README --- docs/getting-started-guides/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/getting-started-guides/README.md b/docs/getting-started-guides/README.md index f4e0ae0b38c..a749d29200a 100644 --- a/docs/getting-started-guides/README.md +++ b/docs/getting-started-guides/README.md @@ -14,7 +14,7 @@ AWS | Saltstack | Ubuntu | OVS | [docs](../../docs/getting Vmware | CoreOS | CoreOS | flannel | [docs](../../docs/getting-started-guides/coreos.md) | Community (@kelseyhightower) | Azure | Saltstack | Ubuntu | OpenVPN | [docs](../../docs/getting-started-guides/azure.md) | Community (@jeffmendoza) | Bare-metal | custom | Ubuntu | _none_ | [docs](../../docs/getting-started-guides/ubuntu_single_node.md) | Community (@jainvipin) | -Bare-metal | custom | Ubuntu Cluster | _none_ | [docs](../../docs/getting-started-guides/ubuntu_multinodes_cluster.md) | community (@resouer @WIZARD-CXY) | use k8s version 0.10.1 +Bare-metal | custom | Ubuntu Cluster | flannel | [docs](../../docs/getting-started-guides/ubuntu_multinodes_cluster.md) | Community (@resouer @WIZARD-CXY) | use k8s version 0.12.0 Local | | | _none_ | [docs](../../docs/getting-started-guides/locally.md) | Inactive | Ovirt | | | | [docs](../../docs/getting-started-guides/ovirt.md) | Inactive | Rackspace | CoreOS | CoreOS | Rackspace | [docs](../../docs/getting-started-guides/rackspace.md) | Inactive | From c80ef5de60a791afe8fa0764aaa4e30837a00da1 Mon Sep 17 00:00:00 2001 From: wizard Date: Fri, 6 Mar 2015 11:04:30 +0800 Subject: [PATCH 2/3] Make the k8s version configurable --- cluster/ubuntu-cluster/build.sh | 8 +++++--- docs/getting-started-guides/ubuntu_multinodes_cluster.md | 5 +++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cluster/ubuntu-cluster/build.sh b/cluster/ubuntu-cluster/build.sh index b4e6de967da..52896f509bc 100755 --- a/cluster/ubuntu-cluster/build.sh +++ b/cluster/ubuntu-cluster/build.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# simple use the sed to replace some ip settings on user's demand +# Download the etcd, flannel, and K8s binaries automatically # Run as root only # author @resouer @@ -51,10 +51,12 @@ if [ ! -f etcd.tar.gz ] ; then fi cp $ETCD/etcd $ETCD/etcdctl binaries -# kuber +# k8s echo "Download kubernetes release ..." + +K8S_V="v0.12.0" if [ ! -f kubernetes.tar.gz ] ; then - curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.10.1/kubernetes.tar.gz -o kubernetes.tar.gz + curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/$K8S_V/kubernetes.tar.gz -o kubernetes.tar.gz tar xzf kubernetes.tar.gz fi pushd kubernetes/server diff --git a/docs/getting-started-guides/ubuntu_multinodes_cluster.md b/docs/getting-started-guides/ubuntu_multinodes_cluster.md index f75c866e61c..ba1173b94c4 100644 --- a/docs/getting-started-guides/ubuntu_multinodes_cluster.md +++ b/docs/getting-started-guides/ubuntu_multinodes_cluster.md @@ -20,10 +20,15 @@ This document describes how to deploy kubernetes on multiple ubuntu nodes, inclu On your laptop, copy `cluster/ubuntu-cluster` directory to your workspace. The `build.sh` will download and build all the needed binaries into `./binaries`. + +You can customize your etcd version or K8s version in the build.sh by changing variable `ETCD_V` and `K8S_V`, default etcd version is 2.0.0 and K8s version is 0.12.0. + + ``` $ cd cluster/ubuntu-cluster $ sudo ./build.sh ``` + Please copy all the files in `./binaries` into `/opt/bin` of every machine you want to run as Kubernetes cluster node. From ca16a57b54020c48be5946089b416f29dab37b83 Mon Sep 17 00:00:00 2001 From: wizard Date: Fri, 6 Mar 2015 12:04:42 +0800 Subject: [PATCH 3/3] Add cleanup function to make the build.sh more robust --- cluster/ubuntu-cluster/build.sh | 8 +++++++- docs/getting-started-guides/ubuntu_multinodes_cluster.md | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cluster/ubuntu-cluster/build.sh b/cluster/ubuntu-cluster/build.sh index 52896f509bc..1dd8b7dd5d1 100755 --- a/cluster/ubuntu-cluster/build.sh +++ b/cluster/ubuntu-cluster/build.sh @@ -17,9 +17,15 @@ # Download the etcd, flannel, and K8s binaries automatically # Run as root only -# author @resouer +# author @resouer @WIZARD-CXY set -e +function cleanup { + # cleanup work + rm -rf flannel kubernetes* etcd* binaries +} +trap cleanup SIGHUP SIGINT SIGTERM + # check root if [ "$(id -u)" != "0" ]; then echo >&2 "Please run as root" diff --git a/docs/getting-started-guides/ubuntu_multinodes_cluster.md b/docs/getting-started-guides/ubuntu_multinodes_cluster.md index ba1173b94c4..b81cdba957a 100644 --- a/docs/getting-started-guides/ubuntu_multinodes_cluster.md +++ b/docs/getting-started-guides/ubuntu_multinodes_cluster.md @@ -11,7 +11,7 @@ This document describes how to deploy kubernetes on multiple ubuntu nodes, inclu *3 These guide is tested OK on Ubuntu 14.04 LTS 64bit server, but it should also work on most Ubuntu versions* -*4 Dependences of this guide: etcd-2.0.0, flannel-0.2.0, k8s-0.10.1, but it should also work on higher versions* +*4 Dependences of this guide: etcd-2.0.0, flannel-0.2.0, k8s-0.12.0, but it may work with higher versions* ### **Main Steps** @@ -21,7 +21,7 @@ On your laptop, copy `cluster/ubuntu-cluster` directory to your workspace. The `build.sh` will download and build all the needed binaries into `./binaries`. -You can customize your etcd version or K8s version in the build.sh by changing variable `ETCD_V` and `K8S_V`, default etcd version is 2.0.0 and K8s version is 0.12.0. +You can customize your etcd version or K8s version in the build.sh by changing variable `ETCD_V` and `K8S_V` in build.sh, default etcd version is 2.0.0 and K8s version is 0.12.0. ```