Merge branch 'master' into use-awscli-query-param

pull/55/head
Stephen Price 2016-09-16 08:37:08 -07:00
commit 55db762205
2 changed files with 5 additions and 3 deletions

View File

@ -21,7 +21,7 @@ The target audience for this tutorial is someone planning to support a productio
* Docker 1.11.2 * Docker 1.11.2
* [CNI Based Networking](https://github.com/containernetworking/cni) * [CNI Based Networking](https://github.com/containernetworking/cni)
* Secure communication between all components (etcd, control plane, workers) * Secure communication between all components (etcd, control plane, workers)
* Default Service Account and Secrets * Default Service Account and Secrets
### What's Missing ### What's Missing
@ -46,13 +46,15 @@ AWS
* The us-west-2 region will be used * The us-west-2 region will be used
## Labs ## Platforms
This tutorial assumes you have access to one of the following: This tutorial assumes you have access to one of the following:
* [Google Cloud Platform](https://cloud.google.com) and the [Google Cloud SDK](https://cloud.google.com/sdk/) (125.0.0+) * [Google Cloud Platform](https://cloud.google.com) and the [Google Cloud SDK](https://cloud.google.com/sdk/) (125.0.0+)
* [Amazon Web Services](https://aws.amazon.com) and the [AWS CLI](https://aws.amazon.com/cli) (1.10.63+) * [Amazon Web Services](https://aws.amazon.com) and the [AWS CLI](https://aws.amazon.com/cli) (1.10.63+)
## Labs
While GCP or AWS will be used for basic infrastructure needs, the things learned in this tutorial apply to every platform. While GCP or AWS will be used for basic infrastructure needs, the things learned in this tutorial apply to every platform.
* [Cloud Infrastructure Provisioning](docs/01-infrastructure.md) * [Cloud Infrastructure Provisioning](docs/01-infrastructure.md)

View File

@ -9,7 +9,7 @@ In this lab you will bootstrap a 3 node etcd cluster. The following virtual mach
## Why ## Why
All Kubernetes components are stateless which greatly simplifies managing a Kubernetes cluster. All state is stored All Kubernetes components are stateless which greatly simplifies managing a Kubernetes cluster. All state is stored
in etcd, which is a database and must be treated special. etcd is being run on a dedicated set of machines for the in etcd, which is a database and must be treated specially. etcd is being run on a dedicated set of machines for the
following reasons: following reasons:
* The etcd lifecycle is not tied to Kubernetes. We should be able to upgrade etcd independently of Kubernetes. * The etcd lifecycle is not tied to Kubernetes. We should be able to upgrade etcd independently of Kubernetes.