From 365562c0b9e920a1f89472ffae80b9aab56821cb Mon Sep 17 00:00:00 2001
From: harry <harryzhang@zju.edu.cn>
Date: Mon, 7 Sep 2015 14:16:45 +0800
Subject: [PATCH] Add default version to scripts

---
 docs/getting-started-guides/docker-multinode.md        | 10 ++++++++--
 docs/getting-started-guides/docker-multinode/master.sh |  4 ++--
 docs/getting-started-guides/docker-multinode/worker.sh |  5 +++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/docs/getting-started-guides/docker-multinode.md b/docs/getting-started-guides/docker-multinode.md
index 135ae4a86e0..89e23702b5e 100644
--- a/docs/getting-started-guides/docker-multinode.md
+++ b/docs/getting-started-guides/docker-multinode.md
@@ -74,6 +74,14 @@ This pattern is necessary because the `flannel` daemon is responsible for settin
 all of the Docker containers created by Kubernetes.  To achieve this, it must run outside of the _main_ Docker daemon.  However,
 it is still useful to use containers for deployment and management, so we create a simpler _bootstrap_ daemon to achieve this.
 
+You can specify k8s version on very node before install:
+
+```
+export K8S_VERSION=<your_k8s_version (e.g. 1.0.3)>
+```
+
+Otherwise, we'll use latest `hyperkube` image as default k8s version.
+
 ## Master Node
 
 The first step in the process is to initialize the master node.
@@ -81,7 +89,6 @@ The first step in the process is to initialize the master node.
 Clone the Kubernetes repo, and run [master.sh](docker-multinode/master.sh) on the master machine with root:
 
 ```sh
-export K8S_VERSION=<your_k8s_version (e.g. 1.0.1)>
 cd kubernetes/docs/getting-started-guides/docker-multinode/
 ./master.sh
 ```
@@ -97,7 +104,6 @@ Once your master is up and running you can add one or more workers on different
 Clone the Kubernetes repo, and run [worker.sh](docker-multinode/worker.sh) on the worker machine with root:
 
 ```sh
-export K8S_VERSION=<your_k8s_version (e.g. 1.0.1)>
 export MASTER_IP=<your_master_ip (e.g. 1.2.3.4)>
 cd kubernetes/docs/getting-started-guides/docker-multinode/
 ./worker.sh
diff --git a/docs/getting-started-guides/docker-multinode/master.sh b/docs/getting-started-guides/docker-multinode/master.sh
index 74e41324d0a..24e413faafe 100755
--- a/docs/getting-started-guides/docker-multinode/master.sh
+++ b/docs/getting-started-guides/docker-multinode/master.sh
@@ -27,8 +27,8 @@ fi
 
 # Make sure k8s version env is properly set
 if [ -z ${K8S_VERSION} ]; then
-    echo "Please export K8S_VERSION in your env"
-    exit 1
+    K8S_VERSION="1.0.3"
+    echo "K8S_VERSION is not set, using default: ${K8S_VERSION}"
 else
     echo "k8s version is set to: ${K8S_VERSION}"
 fi
diff --git a/docs/getting-started-guides/docker-multinode/worker.sh b/docs/getting-started-guides/docker-multinode/worker.sh
index 14b1310d00c..7ad6cc53636 100755
--- a/docs/getting-started-guides/docker-multinode/worker.sh
+++ b/docs/getting-started-guides/docker-multinode/worker.sh
@@ -27,13 +27,14 @@ fi
 
 # Make sure k8s version env is properly set
 if [ -z ${K8S_VERSION} ]; then
-    echo "Please export K8S_VERSION in your env"
-    exit 1
+    K8S_VERSION="1.0.3"
+    echo "K8S_VERSION is not set, using default: ${K8S_VERSION}"
 else
     echo "k8s version is set to: ${K8S_VERSION}"
 fi
 
 
+
 # Run as root
 if [ "$(id -u)" != "0" ]; then
     echo >&2 "Please run as root"