From 87dcab3644aa7065e1ab5eb00c209fb067dc6797 Mon Sep 17 00:00:00 2001 From: Watkins Date: Mon, 12 Sep 2016 11:57:12 -0600 Subject: [PATCH 1/3] Add Platforms Subheading When reading over the Labs subheading, it looked like there were two parts to the labs. This breaks the Labs subheading up into supported Platforms and a list of the Labs. --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f26453b..cbabade 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ The target audience for this tutorial is someone planning to support a productio * Docker 1.11.2 * [CNI Based Networking](https://github.com/containernetworking/cni) * Secure communication between all components (etcd, control plane, workers) -* Default Service Account and Secrets +* Default Service Account and Secrets ### What's Missing @@ -46,13 +46,15 @@ AWS * The us-west-2 region will be used -## Labs +## Platforms 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+) * [Amazon Web Services](https://aws.amazon.com), the [AWS CLI](https://aws.amazon.com/cli) (1.10.63+), and [jq](https://stedolan.github.io/jq) (1.5+) +## Labs + 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) From 8ec636271de62a2d170358ee39240dd49383c557 Mon Sep 17 00:00:00 2001 From: GGC Date: Wed, 14 Sep 2016 19:37:20 -0700 Subject: [PATCH 2/3] jq -j is not a valid option. I think the author meant jq -r --- docs/02-certificate-authority.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/02-certificate-authority.md b/docs/02-certificate-authority.md index 71fa0c9..2ccaf36 100644 --- a/docs/02-certificate-authority.md +++ b/docs/02-certificate-authority.md @@ -237,7 +237,7 @@ The following command will: for host in ${KUBERNETES_HOSTS[*]}; do PUBLIC_IP_ADDRESS=$(aws ec2 describe-instances \ --filters "Name=tag:Name,Values=${host}" | \ - jq -j '.Reservations[].Instances[].PublicIpAddress') + jq -r '.Reservations[].Instances[].PublicIpAddress') scp ca.pem kubernetes-key.pem kubernetes.pem \ ubuntu@${PUBLIC_IP_ADDRESS}:~/ done From 720cdab53ce9a1421425bfa9dd8559fa0e03ba3c Mon Sep 17 00:00:00 2001 From: thejsj Date: Wed, 14 Sep 2016 22:41:42 -0700 Subject: [PATCH 3/3] Fix typo --- docs/03-etcd.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/03-etcd.md b/docs/03-etcd.md index 10bf87c..069f7a1 100644 --- a/docs/03-etcd.md +++ b/docs/03-etcd.md @@ -9,7 +9,7 @@ In this lab you will bootstrap a 3 node etcd cluster. The following virtual mach ## Why 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: * The etcd lifecycle is not tied to Kubernetes. We should be able to upgrade etcd independently of Kubernetes.