fixed 2 links, bit of text polishing

This commit is contained in:
Amy Unruh 2015-07-20 13:11:58 -07:00
parent 960c6a2d8b
commit aacfbba8d3

View File

@ -34,17 +34,17 @@ Documentation for other releases can be found at
# Creating a Kubernetes Cluster # Creating a Kubernetes Cluster
Kubernetes can run on a range of platforms, from your laptop, to VMs on a cloud provider, to rack of Kubernetes can run on a range of platforms, from your laptop, to VMs on a cloud provider, to rack of
bare metal servers. The effort required to setup a cluster varies from running a single command to bare metal servers. The effort required to set up a cluster varies from running a single command to
crafting your own customized cluster. We'll guide you in picking a solution that fits for your needs. crafting your own customized cluster. We'll guide you in picking a solution that fits for your needs.
## Picking the Right Solution ## Picking the Right Solution
If you just want to "kick the tires" on Kubernetes, we recommend the [local Docker-based](docker.md) solution. If you just want to "kick the tires" on Kubernetes, we recommend the [local Docker-based](docker.md) solution.
The local Docker-based solution is one of several [Local cluster](#local-solutions) solutions The local Docker-based solution is one of several [Local cluster](#local-machine-solutions) solutions
that are quick to setup, but are limited to running on one machine. that are quick to set up, but are limited to running on one machine.
When you are ready to scale-up to more machines and higher availability, a [Hosted](#hosted-solutions) When you are ready to scale up to more machines and higher availability, a [Hosted](#hosted-solutions)
solution is the easiest to create and maintain. solution is the easiest to create and maintain.
[Turn-key cloud solutions](#turn-key-cloud-solutions) require only a few commands to create [Turn-key cloud solutions](#turn-key-cloud-solutions) require only a few commands to create
@ -52,16 +52,16 @@ and cover a wider range of cloud providers.
[Custom solutions](#custom-solutions) require more effort to setup but cover and even [Custom solutions](#custom-solutions) require more effort to setup but cover and even
they vary from step-by-step instructions to general advice for setting up they vary from step-by-step instructions to general advice for setting up
a kubernetes cluster from scratch. a Kubernetes cluster from scratch.
### Local-machine Solutions ### Local-machine Solutions
Local-machine solutions create a single cluster with one or more kubernetes nodes on a single Local-machine solutions create a single cluster with one or more Kubernetes nodes on a single
physical machine. Setup is completely automated and doesn't require a cloud provider account. physical machine. Setup is completely automated and doesn't require a cloud provider account.
But their size and availability is limited to that of a single machine. But their size and availability is limited to that of a single machine.
The local-machine solutions are: The local-machine solutions are:
- [Local Docker-based](#local-solutions) (recommended starting point) - [Local Docker-based](docker.md) (recommended starting point)
- [Vagrant](vagrant.md) (works on any platform with Vagrant: Linux, MacOS, or Windows.) - [Vagrant](vagrant.md) (works on any platform with Vagrant: Linux, MacOS, or Windows.)
- [No-VM local cluster](locally.md) (Linux only) - [No-VM local cluster](locally.md) (Linux only)
@ -171,7 +171,7 @@ any | any | any | any | [docs](scratch.md)
Definition of columns: Definition of columns:
- **IaaS Provider** is who/what provides the virtual or physical machines (nodes) that Kubernetes runs on. - **IaaS Provider** is who/what provides the virtual or physical machines (nodes) that Kubernetes runs on.
- **OS** is the base operating system of the nodes. - **OS** is the base operating system of the nodes.
- **Config. Mgmt** is the configuration management system that helps install and maintain kubernetes software on the - **Config. Mgmt** is the configuration management system that helps install and maintain Kubernetes software on the
nodes. nodes.
- **Networking** is what implements the [networking model](../../docs/admin/networking.md). Those with networking type - **Networking** is what implements the [networking model](../../docs/admin/networking.md). Those with networking type
_none_ may not support more than one node, or may support multiple VM nodes only in the same physical node. _none_ may not support more than one node, or may support multiple VM nodes only in the same physical node.
@ -181,9 +181,9 @@ Definition of columns:
- **Project**: Kubernetes Committers regularly use this configuration, so it usually works with the latest release - **Project**: Kubernetes Committers regularly use this configuration, so it usually works with the latest release
of Kubernetes. of Kubernetes.
- **Commercial**: A commercial offering with its own support arrangements. - **Commercial**: A commercial offering with its own support arrangements.
- **Community**: Actively supported by community contributions. May not work with more recent releases of kubernetes. - **Community**: Actively supported by community contributions. May not work with more recent releases of Kubernetes.
- **Inactive**: No active maintainer. Not recommended for first-time K8s users, and may be deleted soon. - **Inactive**: No active maintainer. Not recommended for first-time Kubernetes users, and may be deleted soon.
- **Notes** is relevant information such as version k8s used. - **Notes** is relevant information such as the version of Kubernetes used.
<!-- reference style links below here --> <!-- reference style links below here -->
<!-- GCE conformance test result --> <!-- GCE conformance test result -->