Merge pull request #11109 from resouer/patch-3

Add a script version for kube-in-docker

docs/getting-started-guides/docker-multinode.md

@@ -54,6 +54,9 @@ Please install Docker 1.6.2 or wait for Docker 1.7.1.
 
 1. You need a machine with docker installed.
 
+There is a [bug](https://github.com/docker/docker/issues/14106) in Docker 1.7.0 that prevents this guide from working correctly.
+Please install Docker 1.6.2 or wait for Docker 1.7.1.
+
 ## Overview
 
 This guide will set up a 2-node Kubernetes cluster, consisting of a _master_ node which hosts the API server and orchestrates work
@@ -77,13 +80,33 @@ it is still useful to use containers for deployment and management, so we create
 
 The first step in the process is to initialize the master node.
 
-See [here](docker-multinode/master.md) for detailed instructions.
+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>
+cd kubernetes/cluster/docker-multinode
+./master.sh
+```
+
+`Master done!`
+
+See [here](docker-multinode/master.md) for detailed instructions explaination.
 
 ## Adding a worker node
 
 Once your master is up and running you can add one or more workers on different machines.
 
-See [here](docker-multinode/worker.md) for detailed instructions.
+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> MASTER_IP=<your_master_ip>
+cd kubernetes/cluster/docker-multinode
+./worker.sh
+```
+
+`Worker done!`
+
+See [here](docker-multinode/worker.md) for detailed instructions explaination.
 
 ## Testing your cluster
 

docs/getting-started-guides/docker-multinode/master.sh

@@ -0,0 +1,151 @@
+#!/bin/bash
+
+# Copyright 2015 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# A scripts to install k8s worker node.
+# Author @wizard_cxy @reouser
+
+set -e
+
+# Make sure docker daemon is running
+if ( ! ps -ef | grep "/usr/bin/docker" | grep -v 'grep' &> /dev/null ); then
+    echo "Docker is not running on this machine!"
+    exit 1
+fi
+
+# Make sure k8s version env is properly set
+if [ -z ${K8S_VERSION} ]; then
+    echo "Please export K8S_VERSION in your env"
+    exit 1
+else
+    echo "k8s version is set to: ${K8S_VERSION}"
+fi
+
+
+# Run as root
+if [ "$(id -u)" != "0" ]; then
+    echo >&2 "Please run as root"
+    exit 1
+fi
+
+# Check if a command is valid
+command_exists() {
+    command -v "$@" > /dev/null 2>&1
+}
+
+lsb_dist=""
+
+# Detect the OS distro, we support ubuntu, debian, mint, centos, fedora dist
+detect_lsb() {
+    case "$(uname -m)" in
+    *64)
+        ;;
+    *)
+        echo "Error: We currently only support 64-bit platforms."       
+        exit 1
+        ;;
+    esac
+
+    if command_exists lsb_release; then
+        lsb_dist="$(lsb_release -si)"
+    fi
+    if [ -z ${lsb_dist} ] && [ -r /etc/lsb-release ]; then
+        lsb_dist="$(. /etc/lsb-release && echo "$DISTRIB_ID")"
+    fi
+    if [ -z ${lsb_dist} ] && [ -r /etc/debian_version ]; then
+        lsb_dist='debian'
+    fi
+    if [ -z ${lsb_dist} ] && [ -r /etc/fedora-release ]; then
+        lsb_dist='fedora'
+    fi
+    if [ -z ${lsb_dist} ] && [ -r /etc/os-release ]; then
+        lsb_dist="$(. /etc/os-release && echo "$ID")"
+    fi
+
+    lsb_dist="$(echo ${lsb_dist} | tr '[:upper:]' '[:lower:]')"
+}
+
+
+# Start the bootstrap daemon
+bootstrap_daemon() {
+    sudo -b docker -d -H unix:///var/run/docker-bootstrap.sock -p /var/run/docker-bootstrap.pid --iptables=false --ip-masq=false --bridge=none --graph=/var/lib/docker-bootstrap 2> /var/log/docker-bootstrap.log 1> /dev/null
+    
+    sleep 5
+}
+
+# Start k8s components in containers
+DOCKER_CONF=""
+
+start_k8s(){
+    # Start etcd 
+    docker -H unix:///var/run/docker-bootstrap.sock run --restart=always --net=host -d gcr.io/google_containers/etcd:2.0.12 /usr/local/bin/etcd --addr=127.0.0.1:4001 --bind-addr=0.0.0.0:4001 --data-dir=/var/etcd/data
+
+    sleep 5
+    # Set flannel net config
+    docker -H unix:///var/run/docker-bootstrap.sock run --net=host gcr.io/google_containers/etcd:2.0.12 etcdctl set /coreos.com/network/config '{ "Network": "10.1.0.0/16" }'
+
+    # iface may change to a private network interface, eth0 is for default
+    flannelCID=$(docker -H unix:///var/run/docker-bootstrap.sock run --restart=always -d --net=host --privileged -v /dev/net:/dev/net quay.io/coreos/flannel:0.5.0 /opt/bin/flanneld -iface="eth0")
+
+    sleep 8
+
+    # Copy flannel env out and source it on the host
+    docker -H unix:///var/run/docker-bootstrap.sock cp ${flannelCID}:/run/flannel/subnet.env .
+    source subnet.env
+
+    # Configure docker net settings, then restart it
+    case "$lsb_dist" in
+        fedora|centos|amzn)
+            DOCKER_CONF="/etc/sysconfig/docker"
+        ;;
+        ubuntu|debian|linuxmint)
+            DOCKER_CONF="/etc/default/docker"
+        ;;
+    esac
+
+    # Append the docker opts
+    echo "DOCKER_OPTS=\"\$DOCKER_OPTS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
+
+
+    # sleep a little bit
+    ifconfig docker0 down
+
+    case "$lsb_dist" in
+        fedora|centos|amzn)
+            yum install bridge-utils && brctl delbr docker0 && systemctl restart docker
+        ;;
+        ubuntu|debian|linuxmint)
+            apt-get install bridge-utils && brctl delbr docker0 && service docker restart
+        ;;
+    esac
+
+    # sleep a little bit
+    sleep 5
+
+    # Start kubelet & proxy, then start master components as pods
+    docker run --net=host -d -v /var/run/docker.sock:/var/run/docker.sock  gcr.io/google_containers/hyperkube:v${K8S_VERSION} /hyperkube kubelet --api_servers=http://localhost:8080 --v=2 --address=0.0.0.0 --enable_server --hostname_override=127.0.0.1 --config=/etc/kubernetes/manifests-multi
+    docker run -d --net=host --privileged cr.io/google_containers/hyperkube:v${K8S_VERSION} /hyperkube proxy --master=http://127.0.0.1:8080 --v=2   
+}
+
+echo "Detecting your OS distro ..."
+detect_lsb
+
+echo "Starting bootstrap docker ..."
+bootstrap_daemon
+
+echo "Starting k8s ..."
+start_k8s
+
+echo "Master done!"

docs/getting-started-guides/docker-multinode/worker.sh

@@ -0,0 +1,150 @@
+#!/bin/bash
+
+# Copyright 2015 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# A scripts to install k8s worker node.
+# Author @wizard_cxy @reouser
+
+set -e
+
+# Make sure docker daemon is running
+if ( ! ps -ef | grep "/usr/bin/docker" | grep -v 'grep' &> /dev/null  ); then
+    echo "Docker is not running on this machine!"
+    exit 1
+fi
+
+# Make sure k8s version env is properly set
+if [ -z ${K8S_VERSION} ]; then
+    echo "Please export K8S_VERSION in your env"
+    exit 1
+else
+    echo "k8s version is set to: ${K8S_VERSION}"
+fi
+
+
+# Run as root
+if [ "$(id -u)" != "0" ]; then
+    echo >&2 "Please run as root"
+    exit 1
+fi
+
+# Make sure master ip is properly set
+if [ -z ${MASTER_IP} ]; then
+    echo "Please export MASTER_IP in your env"
+    exit 1
+else
+    echo "k8s master is set to: ${MASTER_IP}"
+fi
+
+# Check if a command is valid
+command_exists() {
+    command -v "$@" > /dev/null 2>&1
+}
+
+lsb_dist=""
+
+# Detect the OS distro, we support ubuntu, debian, mint, centos, fedora dist
+detect_lsb() {
+    case "$(uname -m)" in
+    *64)
+        ;;
+    *)
+	echo "Error: We currently only support 64-bit platforms."	    
+	exit 1
+	;;
+    esac
+
+    if command_exists lsb_release; then
+        lsb_dist="$(lsb_release -si)"
+    fi
+    if [ -z ${lsb_dist} ] && [ -r /etc/lsb-release ]; then
+        lsb_dist="$(. /etc/lsb-release && echo "$DISTRIB_ID")"
+    fi
+    if [ -z ${lsb_dist} ] && [ -r /etc/debian_version ]; then
+        lsb_dist='debian'
+    fi
+    if [ -z ${lsb_dist} ] && [ -r /etc/fedora-release ]; then
+        lsb_dist='fedora'
+    fi
+    if [ -z ${lsb_dist} ] && [ -r /etc/os-release ]; then
+        lsb_dist="$(. /etc/os-release && echo "$ID")"
+    fi
+
+    lsb_dist="$(echo ${lsb_dist} | tr '[:upper:]' '[:lower:]')"
+}
+
+
+# Start the bootstrap daemon
+bootstrap_daemon() {
+    sudo -b docker -d -H unix:///var/run/docker-bootstrap.sock -p /var/run/docker-bootstrap.pid --iptables=false --ip-masq=false --bridge=none --graph=/var/lib/docker-bootstrap 2> /var/log/docker-bootstrap.log 1> /dev/null
+
+    sleep 5
+}
+
+DOCKER_CONF=""
+
+# Start k8s components in containers
+start_k8s() {
+    # Start flannel
+    flannelCID=$(sudo docker -H unix:///var/run/docker-bootstrap.sock run -d --restart=always --net=host --privileged -v /dev/net:/dev/net quay.io/coreos/flannel:0.5.0 /opt/bin/flanneld --etcd-endpoints=http://${MASTER_IP}:4001 -iface="eth0")
+
+    sleep 8
+
+    # Copy flannel env out and source it on the host
+    sudo docker -H unix:///var/run/docker-bootstrap.sock cp ${flannelCID}:/run/flannel/subnet.env .
+    source subnet.env
+
+    # Configure docker net settings, then restart it
+    case "$lsb_dist" in
+        fedora|centos|amzn)
+            DOCKER_CONF="/etc/sysconfig/docker"
+        ;;
+        ubuntu|debian|linuxmint)
+            DOCKER_CONF="/etc/default/docker"
+        ;;
+    esac
+
+    echo "DOCKER_OPTS=\"\$DOCKER_OPTS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
+
+    ifconfig docker0 down
+
+    case "$lsb_dist" in
+        fedora|centos)
+            yum install bridge-utils && brctl delbr docker0 && systemctl restart docker
+        ;;
+        ubuntu|debian|linuxmint)
+            apt-get install bridge-utils && brctl delbr docker0 && service docker restart
+        ;;
+    esac
+
+    # sleep a little bit
+    sleep 5
+    
+    # Start kubelet & proxy in container
+    sudo docker run --net=host -d -v /var/run/docker.sock:/var/run/docker.sock  cr.io/google_containers/hyperkube:v${K8S_VERSION} /hyperkube kubelet --api_servers=http://${MASTER_IP}:8080 --v=2 --address=0.0.0.0 --enable_server --hostname_override=$(hostname -i)
+    sudo docker run -d --net=host --privileged cr.io/google_containers/hyperkube:v${K8S_VERSION} /hyperkube proxy --master=http://${MASTER_IP}:8080 --v=2
+
+}
+
+echo "Detecting your OS distro ..."
+detect_lsb
+
+echo "Starting bootstrap docker ..."
+bootstrap_daemon
+
+echo "Starting k8s ..."
+start_k8s
+
+echo "Worker done!"