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

Merge pull request #21072 from MikeSpreitzer/issue/20292

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-26 03:13:29 -08:00
parent 54a684ac0b 6b8e7e158e
commit 085d7cbbb8
7 changed files with 149 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/getting-started-guides/ubuntu.md
View File

@@ -52,6 +52,12 @@ in the given examples. You can scale to **any number of nodes** by changing some
The original idea was heavily inspired by @jainvipin 's ubuntu single node
work, which has been merge into this document.
The scripting referenced here can be used to deploy Kubernetes with
networking based either on Flannel or on a CNI plugin that you supply.
This document is focused on the Flannel case. See
`kubernetes/cluster/ubuntu/config-default.sh` for remarks on how to
use a CNI plugin instead.
[Cloud team from Zhejiang University](https://github.com/ZJU-SEL) will maintain this work.
## Prerequisites