Merge pull request #22036 from timstclair/docs

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-01 11:46:33 -08:00
3 changed files with 15 additions and 5 deletions

View File

@@ -24,15 +24,15 @@ Advantages of a harmonized image:
## bootstrap-vz
Currently images are built using
(bootstrap-vz)[https://github.com/andsens/bootstrap-vz], because this is
[bootstrap-vz](https://github.com/andsens/bootstrap-vz), because this is
default builder for the official Debian images, and because it supports
multiple clouds including AWS, Azure & GCE. It also supports KVM, which should
support OpenStack.
## Building an image
A go program/script to build images in (in
progress)[https://github.com/kubernetes/contrib/pull/486], in the contrib
A go program/script to build images in
[in progress](https://github.com/kubernetes/contrib/pull/486), in the contrib
project.