Merge pull request aws-samples#338 from dalbhanj/master

Minor fixes, moved Workshop cleanup up to Index page

Author: arun-gupta

01-path-basics/101-start-here/readme.adoc

@@ -93,10 +93,14 @@ You are now ready to continue on with the workshop!
 |image:button-continue-standard.png[link=../102-your-first-cluster/]
 |image:button-continue-developer.png[link=../102-your-first-cluster/]
 |image:button-continue-operations.png[link=../102-your-first-cluster/]
+|link:../../standard-path.adoc[Go to Standard Index]
+|link:../../developer-path.adoc[Go to Developer Index]
+|link:../../operations-path.adoc[Go to Operations Index]
 |=====
 
 The next step is link:../102-your-first-cluster[to create a Kubernetes cluster using kops].
 
+
 == Workshop Cleanup
 
 Once you have finished with the workshop, please don't forget to spin down your cluster or you will incur additional charges.

01-path-basics/102-your-first-cluster/readme.adoc

@@ -12,7 +12,7 @@ If you have not set up the link:../101-start-here[Cloud9 Devlopment Environment,
 
 == Create a Kubernetes Cluster with kops
 
-kops can be used to create a highly available cluster, with multiple master and worker nodes spread across multiple availability zones. 
+kops can be used to create a highly available cluster, with multiple master and worker nodes spread across multiple availability zones.
 The master and worker nodes within the cluster can use either DNS or the https://github.com/weaveworks/mesh[Weave Mesh, window="_blank"] *gossip* protocol for name resolution.  For this workshop, we will use the gossip protocol.  A gossip-based cluster is easier and quicker to setup, and does not does not require a domain, subdomain, or Route53 hosted zone to be registered. Instructions for creating a DNS-based cluster are provided as an appendix at the bottom of this page.
 
 To create a cluster using the gossip protocol, simply use a cluster name with a suffix of `.k8s.local`. In the following steps, we will use `example.cluster.k8s.local` as a sample gossip cluster name. You may choose a different name as long as it ends with `.k8s.local`.
@@ -165,6 +165,9 @@ You are now ready to continue on with the workshop!
 |image:button-continue-standard.png[link=../103-kubernetes-concepts/]
 |image:button-continue-developer.png[link=../103-kubernetes-concepts/]
 |image:button-continue-operations.png[link=../103-kubernetes-concepts/]
+|link:../../standard-path.adoc[Go to Standard Index]
+|link:../../developer-path.adoc[Go to Developer Index]
+|link:../../operations-path.adoc[Go to Operations Index]
 |=====
 The next step is link:../103-kubernetes-concepts[to learn about basic Kubernetes Concepts].
 
@@ -221,7 +224,7 @@ Although most of the exercises in this workshop should work on a cluster with a
 
 === (Optional) Turn on an API version for your Cluster
 
-Note: This section is for Kubebernetes 1.7.x, in 1.8.x the api is `batch/v1beta1`. 
+Note: This section is for Kubebernetes 1.7.x, in 1.8.x the api is `batch/v1beta1`.
 
 Kubernetes resources are created with a specific API version. The exact value is defined by the `apiVersion` attribute in the resource configuration file. Some of the values are `v1`, `extensions/v1beta1` or `batch/v1`. By default, resources with `apiVersion` values X, Y, Z are enabled. If a resource has a version with the word `alpha` in it, then that version needs to be explicitly enabled in the cluster. For example, if you are running a Kubernetes cluster of version 1.7.x, then Cron Job resource cannot be created unless `batch/v2alpha1` is explicitly enabled.
 
@@ -301,7 +304,7 @@ The output clearly shows that `--runtime-config=batch/v2alpha1=true` is passed a
 
 === (Optional) Delete A Cluster
 
-Note: If you are going through the workshop paths, please do not delete the cluster you just created!  
+Note: If you are going through the workshop paths, please do not delete the cluster you just created!
 
 This information is to show you how to delete a cluster.
 (We will also provide these instructions at the end of the workshop.)
@@ -357,7 +360,7 @@ Create a Kubernetes cluster using the following command. For the purposes of thi
 
 The `create cluster` command only creates and stores the cluster config in the S3 bucket. Adding `--yes` option ensures that the cluster is immediately created as well.
 
-Alternatively, you may leave off the `--yes` option from the `kops create cluster` command. This will allow you to use `kops edit cluster example.cluster.com` command to view the current cluster state and make changes before actually creating the cluster. 
+Alternatively, you may leave off the `--yes` option from the `kops create cluster` command. This will allow you to use `kops edit cluster example.cluster.com` command to view the current cluster state and make changes before actually creating the cluster.
 
 The cluster creation, in that case, is started with the following command:
 
@@ -443,4 +446,3 @@ Your cluster example.cluster.com is ready
 Note that all masters are spread across different AZs.
 
 Your output may differ from the one shown here based up on the type of cluster you created.
-

01-path-basics/103-kubernetes-concepts/readme.adoc

@@ -14,9 +14,9 @@ Kubernetes as a platform has a number of abstractions that map to API objects. T
 
 == Prerequisites
 
-This chapter uses a cluster with 3 master nodes and 5 worker nodes as described link:../102-your-first-cluster#multi-master[here]. 
+This chapter uses a cluster with 3 master nodes and 5 worker nodes as described link:../102-your-first-cluster#multi-master[here].
 
-All configuration files for this chapter are in the `01-path-basics/103-kubernetes-concepts/templates` directory. 
+All configuration files for this chapter are in the `01-path-basics/103-kubernetes-concepts/templates` directory.
 Please be sure to `cd` into that directory before running the commands below.
 
     $ cd 01-path-basics/103-kubernetes-concepts/templates
@@ -230,7 +230,7 @@ If the containers in the pod generate logs, then they can be seen using the comm
 
 A Container in a Pod can be assigned memory and CPU _request_ and _limit_. Request is the minimum amount of memory/CPU that Kubernetes will give to the container. Limit is the maximum amount of memory/CPU that a container will be allowed to use. The memory/CPU request/limit for the Pod is the sum of the memory/CPU requests/limits for all the Containers in the Pod. Request defaults to limit if not specified. Default value of the limit is the node capacity.
 
-A Pod can be scheduled on a node if the Pod's memory and CPU request can be met. Memory and CPU limits are not taken into consideration for scheduling. 
+A Pod can be scheduled on a node if the Pod's memory and CPU request can be met. Memory and CPU limits are not taken into consideration for scheduling.
 
 Pod can continue to operate on the node if Containers in the Pod does not exceed the memory request. If Containers in the Pod exceeds the memory request then they become target of eviction whenever the node runs out of memory. If Containers in the Pod exceeds the memory limit then they are terminated. If the Pod can be restarted, then kubelet will restart it, just like any other type of runtime failure. A Container might or might not be allowed to exceed its CPU limit for extended periods of time. However, it will not be killed for excessive usage.
 
@@ -337,7 +337,7 @@ Watch the status of the Pod:
 	wildfly-pod   1/1       Running   3         1m
 	wildfly-pod   0/1       OOMKilled   3         1m
 
-`OOMKilled` shows that the container was terminated because it ran out of memory. 
+`OOMKilled` shows that the container was terminated because it ran out of memory.
 
 In `pod-resources2.yaml`, change the value of `spec.containers[].resources.limits.memory` to `300Mi`. Delete the existing Pod, and create a new one:
 
@@ -369,7 +369,7 @@ Kubernetes assigns one of the QoS classes to the Pod:
 
 QoS class is used by Kubernetes for scheduling and evicting Pods.
 
-When every Container in a Pod is given a memory and CPU limit, and optionally non-zero request, and they exactly match, then a Pod is scheduled with `Guaranteed` QoS. This is the higest priority. 
+When every Container in a Pod is given a memory and CPU limit, and optionally non-zero request, and they exactly match, then a Pod is scheduled with `Guaranteed` QoS. This is the higest priority.
 
 A Pod is given `Burstable` QoS class if the Pod does not meet the `Guaranteed` QoS and at least one Container has a memory or CPU request. This is intermediate priority.
 
@@ -1370,7 +1370,7 @@ A new namespace can be created using a configuration file or `kubectl`.
 
 . Create a new Namespace:
 
-	$ kubectl apply -f namespace.yaml 
+	$ kubectl apply -f namespace.yaml
 	namespace "dev" created
 
 . Get the list of Namespaces:
@@ -1399,31 +1399,31 @@ No resource limits.
 +
 . Create a Deployment in this new Namespace using a configuration file:
 +
-  $ deployment-namespace.yaml 
+  $ deployment-namespace.yaml
 	apiVersion: extensions/v1beta1
 	kind: Deployment
 	metadata:
 	  name: nginx-deployment-ns
 	  namespace: dev
 	spec:
-	  replicas: 3 
+	  replicas: 3
 	  template:
 	    metadata:
 	      labels:
-	        app: nginx 
+	        app: nginx
 	    spec:
 	      containers:
-	      - name: nginx 
+	      - name: nginx
 	        image: nginx:1.12.1
-	        ports: 
+	        ports:
 	        - containerPort: 80
 	        - containerPort: 443
 +
 The main change is the addition of `namespace: dev`.
 +
 . Create the Deployment:
 
-	$ kubectl apply -f deployment-namespace.yaml 
+	$ kubectl apply -f deployment-namespace.yaml
 	deployment "nginx-deployment-ns" created
 
 . Deployment in a Namespace can be queried by providing an additional switch `-n` as shown:
@@ -1446,7 +1446,7 @@ Alternatively, a namespace can be created using `kubectl` as well.
 
 . Create a Deployment:
 
-	$ kubectl -n dev2 apply -f templates/deployment.yaml 
+	$ kubectl -n dev2 apply -f templates/deployment.yaml
 	deployment "nginx-deployment-ns" created
 
 . Get Deployments in the newly created Namespace:
@@ -1646,8 +1646,7 @@ You are now ready to continue on with the workshop!
 |image:button-continue-standard.png[link=../../02-path-working-with-clusters/201-cluster-monitoring]
 |image:button-continue-developer.png[link=../../03-path-application-development/301-local-development]
 |image:button-continue-operations.png[link=../../02-path-working-with-clusters/201-cluster-monitoring]
+|link:../../standard-path.adoc[Go to Standard Index]
+|link:../../developer-path.adoc[Go to Developer Index]
+|link:../../operations-path.adoc[Go to Operations Index]
 |=====
-
-
-
-

02-path-working-with-clusters/201-cluster-monitoring/readme.adoc

@@ -329,4 +329,6 @@ You are now ready to continue on with the workshop!
 |=====
 |image:button-continue-standard.png[link=../../02-path-working-with-clusters/202-service-mesh]
 |image:button-continue-operations.png[link=../../02-path-working-with-clusters/202-service-mesh]
-|=====
+|link:../../standard-path.adoc[Go to Standard Index]
+|link:../../operations-path.adoc[Go to Operations Index]
+|=====

02-path-working-with-clusters/202-service-mesh/readme.adoc

@@ -475,5 +475,6 @@ You are now ready to continue on with the workshop!
 |=====
 |image:button-continue-standard.png[link=../../02-path-working-with-clusters/203-cluster-upgrades]
 |image:button-continue-operations.png[link=../../02-path-working-with-clusters/203-cluster-upgrades]
-|=====    
-
+|link:../../standard-path.adoc[Go to Standard Index]
+|link:../../operations-path.adoc[Go to Operations Index]
+|=====

02-path-working-with-clusters/203-cluster-upgrades/readme.adoc

@@ -14,7 +14,7 @@ with 1.6.10 version and perform an automatic rolling upgrade to 1.7.2 using kops
 
 === Create cluster
 
-Review steps to create link:../prereqs.adoc[prereqs] nad make sure `KOPS_STATE_STORE` and `AWS_AVAILABILITY_ZONES` environment variables are set. More details about creating a cluster are at link:../cluster-install[Create Kubernetes cluster using kops]. 
+Review steps to create link:../prereqs.adoc[prereqs] nad make sure `KOPS_STATE_STORE` and `AWS_AVAILABILITY_ZONES` environment variables are set. More details about creating a cluster are at link:../cluster-install[Create Kubernetes cluster using kops].
 
 In this chapter, we'll create a Kubernetes 1.6.10 version cluster as shown:
 
@@ -102,7 +102,7 @@ I1028 18:19:04.153174   10844 executor.go:91] Tasks: 78 done / 81 total; 3 can r
 I1028 18:19:04.575327   10844 executor.go:91] Tasks: 81 done / 81 total; 0 can run
 Will modify resources:
   LaunchConfiguration/master-eu-central-1a.masters.cluster.k8s.local
-    UserData            
+    UserData
                           ...
                             cat > kube_env.yaml << __EOF_KUBE_ENV
                             Assets:
@@ -113,10 +113,10 @@ Will modify resources:
                             - 1d9788b0f5420e1a219aad2cb8681823fc515e7c@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz
                             - c18ca557507c662e3a072c3475da9bd1bc8a503b@https://kubeupv2.s3.amazonaws.com/kops/1.7.1/linux/amd64/utils.tar.gz
                           ...
-                          
+
 
   LaunchConfiguration/master-eu-central-1b.masters.cluster.k8s.local
-    UserData            
+    UserData
                           ...
                             cat > kube_env.yaml << __EOF_KUBE_ENV
                             Assets:
@@ -127,10 +127,10 @@ Will modify resources:
                             - 1d9788b0f5420e1a219aad2cb8681823fc515e7c@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz
                             - c18ca557507c662e3a072c3475da9bd1bc8a503b@https://kubeupv2.s3.amazonaws.com/kops/1.7.1/linux/amd64/utils.tar.gz
                           ...
-                          
+
 
   LaunchConfiguration/master-eu-central-1c.masters.cluster.k8s.local
-    UserData            
+    UserData
                           ...
                             cat > kube_env.yaml << __EOF_KUBE_ENV
                             Assets:
@@ -141,10 +141,10 @@ Will modify resources:
                             - 1d9788b0f5420e1a219aad2cb8681823fc515e7c@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz
                             - c18ca557507c662e3a072c3475da9bd1bc8a503b@https://kubeupv2.s3.amazonaws.com/kops/1.7.1/linux/amd64/utils.tar.gz
                           ...
-                          
+
 
   LaunchConfiguration/nodes.cluster.k8s.local
-    UserData            
+    UserData
                           ...
                             cat > kube_env.yaml << __EOF_KUBE_ENV
                             Assets:
@@ -155,7 +155,7 @@ Will modify resources:
                             - 1d9788b0f5420e1a219aad2cb8681823fc515e7c@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz
                             - c18ca557507c662e3a072c3475da9bd1bc8a503b@https://kubeupv2.s3.amazonaws.com/kops/1.7.1/linux/amd64/utils.tar.gz
                           ...
-                          
+
 
   LoadBalancer/api.cluster.k8s.local
     Lifecycle              <nil> -> Sync
@@ -298,4 +298,6 @@ You are now ready to continue on with the workshop!
 |=====
 |image:button-continue-standard.png[link=../../03-path-application-development/302-app-discovery]
 |image:button-continue-operations.png[link=../../02-path-working-with-clusters/204-cluster-logging-with-EFK]
+|link:../../standard-path.adoc[Go to Standard Index]
+|link:../../operations-path.adoc[Go to Operations Index]
 |=====

02-path-working-with-clusters/204-cluster-logging-with-EFK/readme.adoc

@@ -75,7 +75,7 @@ Fluentd log group name and stream name are configured in the file `templates/flu
         num_threads 8
       </match>
 
-It uses the default log group name of `kubernetes-logs` and the log stream name of `fluentd-cloudwatch`. 
+It uses the default log group name of `kubernetes-logs` and the log stream name of `fluentd-cloudwatch`.
 
 If you've followed the instructions in this chapter as is, then no change is required in this configuration file. However if a different log group name is used in the previous command or a different log stream name is needed, then that needs to be configured in this configuration file.
 
@@ -247,5 +247,5 @@ You are now ready to continue on with the workshop!
 [align="center", cols="1", grid="none", frame="none"]
 |=====
 |image:button-continue-operations.png[link=../../02-path-working-with-clusters/204-cluster-logging-with-EFK]
+|link:../../operations-path.adoc[Go to Operations Index]
 |=====
-