github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-08 20:50:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18894 from luxas/update_master_multi

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-11 20:38:41 -08:00
parent c4d46adc5e 7d497441b3
commit d246ed00fa
7 changed files with 191 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
docs/getting-started-guides/docker-multinode.md
View File

@@ -38,10 +38,6 @@ _Note_:
These instructions are somewhat significantly more advanced than the [single node](docker.md) instructions. If you are
interested in just starting to explore Kubernetes, we recommend that you start there.
_Note_:
There is a [bug](https://github.com/docker/docker/issues/14106) in Docker 1.7.0 that prevents this from working correctly.
Please install Docker 1.6.2 or Docker 1.7.1.
**Table of Contents**
- [Prerequisites](#prerequisites)
@@ -54,7 +50,7 @@ Please install Docker 1.6.2 or Docker 1.7.1.
## Prerequisites
1. You need a machine with docker of right version installed.
The only thing you need is a machine with **Docker 1.7.1 or higher**
## Overview
@@ -75,10 +71,13 @@ 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:
You can specify the version on every node before install:
```
export K8S_VERSION=<your_k8s_version (e.g. 1.0.3)>
```sh
export K8S_VERSION=<your_k8s_version (e.g. 1.1.3)>
export ETCD_VERSION=<your_etcd_version (e.g. 2.2.1)>
export FLANNEL_VERSION=<your_flannel_version (e.g. 0.5.5)>
export FLANNEL_IFACE=<flannel_interface (defaults to eth0)>
```
Otherwise, we'll use latest `hyperkube` image as default k8s version.
@@ -87,7 +86,8 @@ Otherwise, we'll use latest `hyperkube` image as default k8s version.
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:
The MASTER_IP step here is optional, it defaults to the first value of `hostname -I`.
Clone the Kubernetes repo, and run [master.sh](docker-multinode/master.sh) on the master machine _with root_:
```console
$ export MASTER_IP=<your_master_ip (e.g. 1.2.3.4)>
@@ -103,7 +103,7 @@ See [here](docker-multinode/master.md) for detailed instructions explanation.
Once your master is up and running you can add one or more workers on different machines.
Clone the Kubernetes repo, and run [worker.sh](docker-multinode/worker.sh) on the worker machine with root:
Clone the Kubernetes repo, and run [worker.sh](docker-multinode/worker.sh) on the worker machine _with root_:
```console
$ export MASTER_IP=<your_master_ip (e.g. 1.2.3.4)>