Merge branch 'master' of https://github.com/aws-samples/aws-workshop-for-kubernetes

charlyF · charlyF · commit da2cca7453f4 · 2018-07-09T13:26:52.000-04:00
diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -0,0 +1,15 @@
+For this bug report, be sure to include:
+* A short, descriptive title. Ideally, other community members should be able to get a good idea of the issue just from reading the title.
+* A detailed description of the problem you're experiencing. This should include:
+  * Expected behavior of the workshop and the actual behavior exhibited.
+  * Any details of your application environment that may be relevant.
+  * Commands and output used to reproduce the issue.
+* [Markdown][https://guides.github.com/features/mastering-markdown/] formatting as appropriate to make the report easier to read; for example use code blocks when pasting a code snippet and exception stacktraces.
+
+*Description:*
+
+
+*Expected vs. Actual Behavior:*
+
+
+*Environment Details:*
diff --git a/.github/ISSUE_TEMPLATE/ENHANCEMENT.md b/.github/ISSUE_TEMPLATE/ENHANCEMENT.md
@@ -0,0 +1,14 @@
+For this enhancement, be sure to include:
+* A short, descriptive title. Ideally, other community members should be able to get a good idea of the enhancement just from reading the title.
+* A detailed description of the the proposed enhancement. Include justification for why it should be added to the workshop, and possibly example code to illustrate how it should work.
+* link:https://guides.github.com/features/mastering-markdown/[Markdown] formatting as appropriate to make the request easier to read.
+* If you intend to implement this enhancement, indicate that you'd like to the issue to be assigned to you.
+
+
+*Description:*
+
+
+*Justification (Why should this be added?):*
+
+
+*Assigned to you? (Y/N)*
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,4 @@
-*Issue #, if available:*
+*Issue #, if available (include [keywords](https://help.github.com/articles/closing-issues-using-keywords/) to close issue as applicable, e.g. "fixes <##>"):*
 
 *Description of changes:*
 
diff --git a/01-path-basics/101-start-here/readme.adoc b/01-path-basics/101-start-here/readme.adoc
@@ -119,7 +119,7 @@ Ensure that you have deleted all services, etc from the `default` namespace befo
 
 === Using EKS
 
-==== Delete EKS worker nodeds
+==== Delete EKS worker nodes
 
 Go to CloudFormation console, right click template with name 'k8s-workshop-worker-nodes' and select 'Delete Stack'
 
diff --git a/02-path-working-with-clusters/201-cluster-monitoring/readme.adoc b/02-path-working-with-clusters/201-cluster-monitoring/readme.adoc
@@ -18,7 +18,7 @@ Heapster is limited to Kuberenetes container metrics, it is not general use. Hea
 
 == Prerequisites
 
-In order to perform exercises in this chapter, you'll need to deploy configurations to an EKS cluster.  To create an EKS cluster, use the link:../../01-path-basics/102-your-first-cluster#create-a-kubernetes-cluster-with-eks[AWS CLI] (recommended), or alternatively, link:../../01-path-basics/102-your-first-cluster#alternative-create-a-kubernetes-cluster-with-kops[kops].
+In order to perform exercises in this chapter, you’ll need to deploy configurations to a Kubernetes cluster. To create an EKS-based Kubernetes cluster, use the link:../../01-path-basics/102-your-first-cluster#create-a-kubernetes-cluster-with-eks[AWS CLI] (recommended). If you wish to create a Kubernetes cluster without EKS, you can instead use link:../../01-path-basics/102-your-first-cluster#alternative-create-a-kubernetes-cluster-with-kops[kops].
 
 All configuration files for this chapter are in the link:templates[201-cluster-monitoring/templates] directory.
 
diff --git a/02-path-working-with-clusters/204-cluster-logging-with-EFK/readme.adoc b/02-path-working-with-clusters/204-cluster-logging-with-EFK/readme.adoc
@@ -16,7 +16,7 @@ In terms of architecture, Fluentd is deployed as a DaemonSet with the CloudWatch
 
 == Prerequisites
 
-This chapter uses a cluster with 3 master nodes and 5 worker nodes as described here: link:../cluster-install#multi-master-multi-node-multi-az-gossip-based-cluster[multi-master, multi-node gossip based cluster].
+In order to perform exercises in this chapter, you’ll need to deploy configurations to a Kubernetes cluster. To create an EKS-based Kubernetes cluster, use the link:../../01-path-basics/102-your-first-cluster#create-a-kubernetes-cluster-with-eks[AWS CLI] (recommended). If you wish to create a Kubernetes cluster without EKS, you can instead use link:../../01-path-basics/102-your-first-cluster#alternative-create-a-kubernetes-cluster-with-kops[kops].
 
 All configuration files for this chapter are in the `02-path-working-with-clusters/204-cluster-logging-with-EFK` directory. Make sure you change to that directory before giving any commands in this chapter.
 
diff --git a/02-path-working-with-clusters/205-cluster-autoscaling/readme.adoc b/02-path-working-with-clusters/205-cluster-autoscaling/readme.adoc
@@ -7,7 +7,7 @@ This tutorial will walk you through how to setup cluster scaling using `cluster-
 
 == Prerequisites
 
-This chapter uses a cluster with 3 master nodes and 5 worker nodes as described here: link:../cluster-install#multi-master-multi-node-multi-az-gossip-based-cluster[multi-master, multi-node gossip based cluster].
+In order to perform exercises in this chapter, you’ll need to deploy configurations to a Kubernetes cluster. To create an EKS-based Kubernetes cluster, use the link:../../01-path-basics/102-your-first-cluster#create-a-kubernetes-cluster-with-eks[AWS CLI] (recommended). If you wish to create a Kubernetes cluster without EKS, you can instead use link:../../01-path-basics/102-your-first-cluster#alternative-create-a-kubernetes-cluster-with-kops[kops].
 
 All configuration files for this chapter are in the `cluster-scaling` directory. Make sure you change to that directory before giving any commands in this chapter.
 
diff --git a/03-path-application-development/302-app-discovery/readme.adoc b/03-path-application-development/302-app-discovery/readme.adoc
@@ -8,7 +8,7 @@ This chapter shows an example of how different microservices within an applicati
 
 == Prerequisites
 
-This chapter uses a cluster with 3 master nodes and 5 worker nodes as described here: link:../../01-path-basics/102-your-first-cluster#multi-master-cluster[multi-master cluster].
+In order to perform exercises in this chapter, you’ll need to deploy configurations to a Kubernetes cluster. To create an EKS-based Kubernetes cluster, use the link:../../01-path-basics/102-your-first-cluster#create-a-kubernetes-cluster-with-eks[AWS CLI] (recommended). If you wish to create a Kubernetes cluster without EKS, you can instead use link:../../01-path-basics/102-your-first-cluster#alternative-create-a-kubernetes-cluster-with-kops[kops].
 
 All configuration files for this chapter are in the `microservices` directory. Make sure you change to that directory before giving any commands in this chapter.
 
diff --git a/03-path-application-development/303-app-update/readme.adoc b/03-path-application-development/303-app-update/readme.adoc
@@ -14,7 +14,7 @@ For our usecase, the application initially uses the image `arungupta/app-upgrade
 
 == Prerequisites
 
-This chapter uses a cluster with 3 master nodes and 5 worker nodes as described here: link:../cluster-install#multi-master-multi-node-multi-az-gossip-based-cluster[multi-master, multi-node gossip based cluster].
+In order to perform exercises in this chapter, you’ll need to deploy configurations to a Kubernetes cluster. To create an EKS-based Kubernetes cluster, use the link:../../01-path-basics/102-your-first-cluster#create-a-kubernetes-cluster-with-eks[AWS CLI] (recommended). If you wish to create a Kubernetes cluster without EKS, you can instead use link:../../01-path-basics/102-your-first-cluster#alternative-create-a-kubernetes-cluster-with-kops[kops].
 
 All configuration files for this chapter are in the `app-udpate` directory. Make sure you change to that directory before giving any commands in this chapter.
 
diff --git a/03-path-application-development/304-app-scaling/readme.adoc b/03-path-application-development/304-app-scaling/readme.adoc
@@ -14,7 +14,7 @@ HPA can automatically scale pods deployed in a replication controller, deploymen
 
 == Prerequisites
 
-This chapter uses a cluster with 3 master nodes and 5 worker nodes as described here: link:../cluster-install#multi-master-multi-node-multi-az-gossip-based-cluster[multi-master, multi-node gossip based cluster].
+In order to perform exercises in this chapter, you’ll need to deploy configurations to a Kubernetes cluster. To create an EKS-based Kubernetes cluster, use the link:../../01-path-basics/102-your-first-cluster#create-a-kubernetes-cluster-with-eks[AWS CLI] (recommended). If you wish to create a Kubernetes cluster without EKS, you can instead use link:../../01-path-basics/102-your-first-cluster#alternative-create-a-kubernetes-cluster-with-kops[kops].
 
 Deploy Heapster using the steps described in the link:../../02-path-working-with-clusters/201-cluster-monitoring#installation[Cluster Monitoring] lab. You can deploy Heapster using the configuration file `cluster-monitoring/heapster/templates/heapster.yaml`:
 
diff --git a/03-path-application-development/305-app-tracing-with-jaeger-and-x-ray/x-ray/readme.adoc b/03-path-application-development/305-app-tracing-with-jaeger-and-x-ray/x-ray/readme.adoc
@@ -5,9 +5,8 @@ This chapter will explain how to use https://aws.amazon.com/xray/[AWS X-Ray] to
 
 == Pre-requisites
 
-A 3 master nodes and 5 worker nodes cluster as explained at link:../cluster-install#multi-master-multi-node-multi-az-gossip-based-cluster[] is used for this chapter.
-
-Your will need AWS CLI and Docker installed on your desktop.
+In order to perform exercises in this chapter, you’ll need to deploy configurations to a Kubernetes cluster. To create an EKS-based Kubernetes cluster, use the link:/01-path-basics/102-your-first-cluster#create-a-kubernetes-cluster-with-eks[AWS CLI] (recommended). If you wish to create a Kubernetes cluster without EKS, you can instead use link:/01-path-basics/102-your-first-cluster#alternative-create-a-kubernetes-cluster-with-kops[kops].
+You will need AWS CLI and Docker installed on your desktop.
 
 The AWS Region where you deployed Kubernetes must have the following services:
 
diff --git a/03-path-application-development/306-app-management-with-helm/readme.adoc b/03-path-application-development/306-app-management-with-helm/readme.adoc
@@ -8,7 +8,7 @@ https://github.com/kubernetes/helm[Helm] is a tool for managing https://github.c
 
 == Prerequisites
 
-This chapter uses a cluster with 3 master nodes and 5 worker nodes as described here: link:../cluster-install#multi-master-multi-node-multi-az-gossip-based-cluster[multi-master, multi-node gossip based cluster].
+In order to perform exercises in this chapter, you’ll need to deploy configurations to a Kubernetes cluster. To create an EKS-based Kubernetes cluster, use the link:../../01-path-basics/102-your-first-cluster#create-a-kubernetes-cluster-with-eks[AWS CLI] (recommended). If you wish to create a Kubernetes cluster without EKS, you can instead use link:../../01-path-basics/102-your-first-cluster#alternative-create-a-kubernetes-cluster-with-kops[kops].
 
 All configuration files for this chapter are in the `helm` directory. Make sure you change to that directory before giving any commands in this chapter.
 
diff --git a/03-path-application-development/307-statefulsets-and-pvs/readme.adoc b/03-path-application-development/307-statefulsets-and-pvs/readme.adoc
@@ -14,7 +14,7 @@ is built into the StatefulSet. Lastly, we'll demonstrate how to use scale option
 
 == Prerequisites
 
-This chapter uses a cluster with 3 master nodes and 5 worker nodes as described here: link:../cluster-install#multi-master-multi-node-multi-az-gossip-based-cluster[multi-master, multi-node gossip based cluster].
+In order to perform exercises in this chapter, you’ll need to deploy configurations to a Kubernetes cluster. To create an EKS-based Kubernetes cluster, use the link:../../01-path-basics/102-your-first-cluster#create-a-kubernetes-cluster-with-eks[AWS CLI] (recommended). If you wish to create a Kubernetes cluster without EKS, you can instead use link:../../01-path-basics/102-your-first-cluster#alternative-create-a-kubernetes-cluster-with-kops[kops].
 
 All configuration files for this chapter are in the `statefulsets` directory. Make sure you change to that directory before giving any commands in this chapter.
 
diff --git a/03-path-application-development/309-deploying-a-chart-repository/readme.adoc b/03-path-application-development/309-deploying-a-chart-repository/readme.adoc
@@ -12,7 +12,7 @@ applications.
 
 == Prerequisites
 
-This chapter uses a cluster with 3 master nodes and 5 worker nodes as described here: link:../cluster-install#multi-master-multi-node-multi-az-gossip-based-cluster[multi-master, multi-node gossip based cluster].
+In order to perform exercises in this chapter, you’ll need to deploy configurations to a Kubernetes cluster. To create an EKS-based Kubernetes cluster, use the link:../../01-path-basics/102-your-first-cluster#create-a-kubernetes-cluster-with-eks[AWS CLI] (recommended). If you wish to create a Kubernetes cluster without EKS, you can instead use link:../../01-path-basics/102-your-first-cluster#alternative-create-a-kubernetes-cluster-with-kops[kops].
 
 All configuration files for this chapter are in the `sample` directory. Make
 sure to `cd` into this directory before running any commands.
diff --git a/03-path-application-development/310-chaos-engineering/readme.adoc b/03-path-application-development/310-chaos-engineering/readme.adoc
@@ -8,7 +8,7 @@ This chapter explores how you can conduct Chaos Engineering against your applica
 
 == Prerequisites
 
-This chapter uses a cluster with 3 master nodes and 5 worker nodes as described here: link:../cluster-install#multi-master-multi-node-multi-az-gossip-based-cluster[multi-master, multi-node gossip based cluster].
+In order to perform exercises in this chapter, you’ll need to deploy configurations to a Kubernetes cluster. To create an EKS-based Kubernetes cluster, use the link:../../01-path-basics/102-your-first-cluster#create-a-kubernetes-cluster-with-eks[AWS CLI] (recommended). If you wish to create a Kubernetes cluster without EKS, you can instead use link:../../01-path-basics/102-your-first-cluster#alternative-create-a-kubernetes-cluster-with-kops[kops].
 
 All configuration files for this chapter are in the `experiments` directory. Make sure you change to that directory before executing any commands from this chapter.
 
diff --git a/04-path-security-and-networking/401-configmaps-and-secrets/readme.adoc b/04-path-security-and-networking/401-configmaps-and-secrets/readme.adoc
@@ -19,7 +19,7 @@ Make sure you change to that directory before giving any commands in this chapte
 
 == Prerequisites
 
-This chapter uses a cluster with 3 master nodes and 5 worker nodes as described here: link:../cluster-install#multi-master-multi-node-multi-az-gossip-based-cluster[multi-master, multi-node gossip based cluster].
+In order to perform exercises in this chapter, you’ll need to deploy configurations to a Kubernetes cluster. To create an EKS-based Kubernetes cluster, use the link:../../01-path-basics/102-your-first-cluster#create-a-kubernetes-cluster-with-eks[AWS CLI] (recommended). If you wish to create a Kubernetes cluster without EKS, you can instead use link:../../01-path-basics/102-your-first-cluster#alternative-create-a-kubernetes-cluster-with-kops[kops].
 
 All configuration files for this chapter are in the `config-secrets` directory.
 
diff --git a/04-path-security-and-networking/402-authentication-and-authorization/readme.adoc b/04-path-security-and-networking/402-authentication-and-authorization/readme.adoc
@@ -18,7 +18,7 @@ This chapter will walk you through:
 
 == Prerequisites
 
-This chapter uses a cluster with 3 master nodes and 5 worker nodes as described here: link:../cluster-install#multi-master-multi-node-multi-az-gossip-based-cluster[multi-master, multi-node gossip based cluster].
+In order to perform exercises in this chapter, you’ll need to deploy configurations to a Kubernetes cluster. To create an EKS-based Kubernetes cluster, use the link:../../01-path-basics/102-your-first-cluster#create-a-kubernetes-cluster-with-eks[AWS CLI] (recommended). If you wish to create a Kubernetes cluster without EKS, you can instead use link:../../01-path-basics/102-your-first-cluster#alternative-create-a-kubernetes-cluster-with-kops[kops].
 
 All configuration files for this chapter are in the `roles` directory.
 
diff --git a/04-path-security-and-networking/404-network-policies/weavenet/readme.adoc b/04-path-security-and-networking/404-network-policies/weavenet/readme.adoc
@@ -9,7 +9,7 @@ This exercise will walk you through configuring Weave Net and applying a Network
 
 == Prerequisites
 
-This chapter uses a cluster with 3 master nodes and 5 worker nodes as described here: link:../../cluster-install#multi-master-multi-node-multi-az-gossip-based-cluster[multi-master, multi-node gossip based cluster], except we ask kops to use Weave Net as shown below:
+In order to perform exercises in this chapter, you’ll need to deploy configurations to a 3 master, 5 worker kops-created cluster created with the following command-line:
 
   kops create cluster \
     --name example2.cluster.k8s.local \
@@ -19,7 +19,7 @@ This chapter uses a cluster with 3 master nodes and 5 worker nodes as described
     --networking weave \
     --yes
 
-It uses `--networking weave` which tells the cluster to use Weave Net instead of the default networking provided by kubenet. Note, the name here is `example2.cluster.k8s.local` instead of the usual `example.cluster.k8s.local` name. This is just to make sure, in case, the two clusters can coexist.
+This command-line implements the `--networking weave` option, which tells the cluster to use Weave Net instead of the default networking provided by kubenet. Note, the name here is `example2.cluster.k8s.local` instead of the usual `example.cluster.k8s.local` name. This is just to make sure, in case, the two clusters can coexist.
 
 To check the network configuration is using Weave Net, view the cluster configuration using the following command:
 
diff --git a/04-path-security-and-networking/405-ingress-controllers/readme.adoc b/04-path-security-and-networking/405-ingress-controllers/readme.adoc
@@ -19,8 +19,7 @@ There is no default Ingress controller provided in Kubernetes. It may be provide
 Since an Ingress controller is not provided on AWS by default, we will install one.
 
 == Prerequisites
-
-This chapter uses a cluster with 3 master nodes and 5 worker nodes as described here: link:../cluster-install#multi-master-multi-node-multi-az-gossip-based-cluster[multi-master, multi-node gossip based cluster].
+In order to perform exercises in this chapter, you’ll need to deploy configurations to a Kubernetes cluster. To create an EKS-based Kubernetes cluster, use the link:../../01-path-basics/102-your-first-cluster#create-a-kubernetes-cluster-with-eks[AWS CLI] (recommended). If you wish to create a Kubernetes cluster without EKS, you can instead use link:../../01-path-basics/102-your-first-cluster#alternative-create-a-kubernetes-cluster-with-kops[kops].
 
 == Nginx Ingress Controller
 
diff --git a/04-path-security-and-networking/406-coredns/readme.adoc b/04-path-security-and-networking/406-coredns/readme.adoc
@@ -16,7 +16,7 @@ This chapter will explain how to update an existing Kubernetes cluster to use Co
 
 == Prerequisites
 
-This chapter uses a cluster with 3 master nodes and 5 worker nodes as described here: link:../cluster-install#multi-master-multi-node-multi-az-gossip-based-cluster[multi-master, multi-node gossip based cluster].
+In order to perform exercises in this chapter, you’ll need to deploy configurations to a Kubernetes cluster. To create an EKS-based Kubernetes cluster, use the link:../../01-path-basics/102-your-first-cluster#create-a-kubernetes-cluster-with-eks[AWS CLI] (recommended). If you wish to create a Kubernetes cluster without EKS, you can instead use link:../../01-path-basics/102-your-first-cluster#alternative-create-a-kubernetes-cluster-with-kops[kops].
 
 All configuration files for this chapter are in the `coredns` directory. Make sure you change to that directory before giving any commands in this chapter.
 
diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Issue #, if available:`
	`1`	`+Issue #, if available (include [keywords](https://help.github.com/articles/closing-issues-using-keywords/) to close issue as applicable, e.g. "fixes <##>"):`
`2`	`2`
`3`	`3`	`Description of changes:`
`4`	`4`