Merge branch 'master' into master

Author: buzzsurfr

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

@@ -77,6 +77,8 @@ image:cloud9-run-script.png[Running the script in Cloud9 Terminal]
 [NOTE]
 All shell commands _(starting with "$")_ throughout the rest of the workshop should be run in this tab. You may want to resize it upwards to make it larger.
 
+At this point you can restart the Cloud9 IDE terminal session to ensure that the kublectl completion is enabled. Once a new terminal window is opened, type $ kubectl get nodes.
+
 One last step is required so that the Cloud9 IDE uses the assigned IAM Instance profile. Open the "AWS Cloud9" menu, go to "Preferences", go to "AWS Settings", and disable "AWS managed temporary credentials" as depicted in the diagram here:
 
 image:cloud9-disable-temp-credentials.png[]
@@ -93,10 +95,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/101-start-here/scripts/lab-ide-build.sh

@@ -11,10 +11,13 @@
 # Install jq
 sudo yum -y install jq
 
+# Install bash-completion
+sudo yum install bash-completion -y
+
 # Install kubectl
 curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
 chmod +x kubectl && sudo mv kubectl /usr/local/bin/
-source <(kubectl completion bash)
+echo "source <(kubectl completion bash)" >> ~/.bashrc
 
 # Install kops
 curl -LO https://github.com/kubernetes/kops/releases/download/$(curl -s https://api.github.com/repos/kubernetes/kops/releases/latest | grep tag_name | cut -d '"' -f 4)/kops-linux-amd64
@@ -44,5 +47,7 @@ echo "export AWS_AVAILABILITY_ZONES KOPS_STATE_STORE" >> ~/.bash_profile
 # Create SSH key
 ssh-keygen -t rsa -N "" -f ~/.ssh/id_rsa
 
-# Download lab Repository
-git clone https://github.com/aws-samples/aws-workshop-for-kubernetes
+if [ ! -d "aws-workshop-for-kubernetes/" ]; then
+  # Download lab Repository
+  git clone https://github.com/aws-samples/aws-workshop-for-kubernetes
+fi

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

@@ -1446,7 +1446,7 @@ Alternatively, a namespace can be created using `kubectl` as well.
 
 . Create a Deployment:
 
-	$ kubectl -n dev2 apply -f deployment.yaml
+	$ kubectl -n dev2 apply -f templates/deployment.yaml
 	deployment "nginx-deployment-ns" created
 
 . Get Deployments in the newly created Namespace:
@@ -1646,4 +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]
 |=====
-

02-path-working-with-clusters/205-cluster-autoscaling/readme.adoc

@@ -220,11 +220,11 @@ Before running the command below, update the following attributes in file `templ
 
 You can find the name of nodes ASG using this command
 
-  $ aws autoscaling describe-auto-scaling-groups --query 'AutoScalingGroups[].AutoScalingGroupName' 
+  $ aws autoscaling describe-auto-scaling-groups --query 'AutoScalingGroups[].AutoScalingGroupName'
   [
-      "master-eu-central-1a.masters.cluster.k8s.local", 
-      "master-eu-central-1b.masters.cluster.k8s.local", 
-      "master-eu-central-1c.masters.cluster.k8s.local", 
+      "master-eu-central-1a.masters.cluster.k8s.local",
+      "master-eu-central-1b.masters.cluster.k8s.local",
+      "master-eu-central-1c.masters.cluster.k8s.local",
       "nodes.example.cluster.k8s.local"
   ]
 
@@ -289,14 +289,14 @@ If you have deployed Heapster, as described in the link:../cluster-monitoring/RE
 
 ```
 $ kubectl top nodes
-NAME                                             CPU(cores)   CPU%      MEMORY(bytes)   MEMORY%   
-ip-172-20-109-10.eu-central-1.compute.internal   543m         27%       1722Mi          44%       
-ip-172-20-44-33.eu-central-1.compute.internal    125m         12%       2120Mi          57%       
-ip-172-20-75-132.eu-central-1.compute.internal   607m         30%       1733Mi          44%       
-ip-172-20-41-77.eu-central-1.compute.internal    450m         22%       1703Mi          44%       
-ip-172-20-85-128.eu-central-1.compute.internal   86m          8%        2049Mi          55%       
-ip-172-20-93-108.eu-central-1.compute.internal   534m         26%       1747Mi          45%       
-ip-172-20-106-93.eu-central-1.compute.internal   522m         26%       1734Mi          44%       
+NAME                                             CPU(cores)   CPU%      MEMORY(bytes)   MEMORY%
+ip-172-20-109-10.eu-central-1.compute.internal   543m         27%       1722Mi          44%
+ip-172-20-44-33.eu-central-1.compute.internal    125m         12%       2120Mi          57%
+ip-172-20-75-132.eu-central-1.compute.internal   607m         30%       1733Mi          44%
+ip-172-20-41-77.eu-central-1.compute.internal    450m         22%       1703Mi          44%
+ip-172-20-85-128.eu-central-1.compute.internal   86m          8%        2049Mi          55%
+ip-172-20-93-108.eu-central-1.compute.internal   534m         26%       1747Mi          45%
+ip-172-20-106-93.eu-central-1.compute.internal   522m         26%       1734Mi          44%
 ip-172-20-101-20.eu-central-1.compute.internal   101m         5%        2046Mi          55%
 ```
 
@@ -319,20 +319,20 @@ It takes a few minutes for the additional worker nodes to start and become part
 
 ```
 $ kubectl top nodes
-NAME                                              CPU(cores)   CPU%      MEMORY(bytes)   MEMORY%   
-ip-172-20-85-128.eu-central-1.compute.internal    74m          7%        2088Mi          56%       
-ip-172-20-93-108.eu-central-1.compute.internal    25m          1%        1734Mi          44%       
-ip-172-20-109-10.eu-central-1.compute.internal    26m          1%        1716Mi          44%       
-ip-172-20-86-51.eu-central-1.compute.internal     24m          1%        1075Mi          27%       
-ip-172-20-51-221.eu-central-1.compute.internal    21m          1%        1074Mi          27%       
-ip-172-20-61-253.eu-central-1.compute.internal    22m          1%        1075Mi          27%       
-ip-172-20-41-77.eu-central-1.compute.internal     31m          1%        1716Mi          44%       
-ip-172-20-106-93.eu-central-1.compute.internal    27m          1%        1745Mi          45%       
-ip-172-20-101-20.eu-central-1.compute.internal    94m          4%        2078Mi          56%       
-ip-172-20-44-33.eu-central-1.compute.internal     112m         11%       2148Mi          58%       
-ip-172-20-116-218.eu-central-1.compute.internal   22m          1%        1070Mi          27%       
-ip-172-20-44-50.eu-central-1.compute.internal     18m          0%        1076Mi          27%       
-ip-172-20-75-132.eu-central-1.compute.internal    27m          1%        1723Mi          44% 
+NAME                                              CPU(cores)   CPU%      MEMORY(bytes)   MEMORY%
+ip-172-20-85-128.eu-central-1.compute.internal    74m          7%        2088Mi          56%
+ip-172-20-93-108.eu-central-1.compute.internal    25m          1%        1734Mi          44%
+ip-172-20-109-10.eu-central-1.compute.internal    26m          1%        1716Mi          44%
+ip-172-20-86-51.eu-central-1.compute.internal     24m          1%        1075Mi          27%
+ip-172-20-51-221.eu-central-1.compute.internal    21m          1%        1074Mi          27%
+ip-172-20-61-253.eu-central-1.compute.internal    22m          1%        1075Mi          27%
+ip-172-20-41-77.eu-central-1.compute.internal     31m          1%        1716Mi          44%
+ip-172-20-106-93.eu-central-1.compute.internal    27m          1%        1745Mi          45%
+ip-172-20-101-20.eu-central-1.compute.internal    94m          4%        2078Mi          56%
+ip-172-20-44-33.eu-central-1.compute.internal     112m         11%       2148Mi          58%
+ip-172-20-116-218.eu-central-1.compute.internal   22m          1%        1070Mi          27%
+ip-172-20-44-50.eu-central-1.compute.internal     18m          0%        1076Mi          27%
+ip-172-20-75-132.eu-central-1.compute.internal    27m          1%        1723Mi          44%
 ```
 
 You are now ready to continue on with the workshop!
@@ -344,4 +344,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/205-cluster-autoscaling]
+|link:../../operations-path.adoc[Go to Operations Index]
 |=====

02-path-working-with-clusters/206-cloudformation-and-terraform/readme.adoc

@@ -32,7 +32,7 @@ The following is an explanation of the input parameters:
 	MasterInstanceType: EC2 instance type of master. # Defaulted to c4.xlarge
 	NetworkProvider: Container networking provider. # Defaulted to none
 	NodeInstanceType: EC2 instance type of nodes. # Defaulted to c4.large
-	Nodes: Number of k8s nodes. # Defaulted to 3 
+	Nodes: Number of k8s nodes. # Defaulted to 3
 
 NOTE: https://kubernetes.io/docs/setup/independent/create-cluster-kubeadm/[kubeadm] is used to create the cluster. Currently, it allows to create a single master, with a single etcd database running on it. This means your cluster is not highly available.
 
@@ -50,4 +50,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=../../04-path-security-and-networking/401-configmaps-and-secrets]
+|link:../../operations-path.adoc[Go to Operations Index]
 |=====