Fix images links for 30x; Add buttons for 40x and 50x

Scott Malkie · Scott Malkie · commit a83caa8c20c7 · 2018-01-28T10:01:13.000-05:00
diff --git a/03-path-application-development/301-local-development/readme.adoc b/03-path-application-development/301-local-development/readme.adoc
@@ -2,7 +2,7 @@
 :toc:
 :icons:
 :linkcss:
-:imagesdir: ../resources/images
+:imagesdir: ../../resources/images
 
 For local development purposes, you can create a one-node cluster using https://github.com/kubernetes/minikube[Minikube].
 Hosted solutions or cloud-based solutions provide the scalability and higher availability for staging or production purposes.
diff --git a/03-path-application-development/302-app-discovery/readme.adoc b/03-path-application-development/302-app-discovery/readme.adoc
@@ -2,7 +2,7 @@
 :toc:
 :icons:
 :linkcss:
-:imagesdir: ../resources/images
+:imagesdir: ../../resources/images
 
 This chapter shows an example of how different microservices within an application can use service discovery to locate each other in the infrastructure rather than via hardcoded IP addresses.
 
diff --git a/03-path-application-development/303-app-update/readme.adoc b/03-path-application-development/303-app-update/readme.adoc
@@ -2,7 +2,7 @@
 :toc:
 :icons:
 :linkcss:
-:imagesdir: ../resources/images
+:imagesdir: ../../resources/images
 
 This chapter explains how an application deployed in a Kubernetes cluster can be updated using link:../developer-concepts#deployment[Deployment]. It also explains Canary Deployment of an application.
 
diff --git a/03-path-application-development/304-app-scaling/readme.adoc b/03-path-application-development/304-app-scaling/readme.adoc
@@ -2,7 +2,7 @@
 :toc:
 :icons:
 :linkcss:
-:imagesdir: ../resources/images
+:imagesdir: ../../resources/images
 
 https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/[Horizontal Pod Autoscaling] (HPA) is a Kubernetes feature to dynamically increase/decrease the number of pod replicas based on resource utilization metrics.
 
@@ -115,7 +115,7 @@ You are now ready to continue on with the workshop!
 
 [align="center", cols="2", grid="none", frame="none"]
 |=====
-|image:button-continue-standard.png[link=../../05-path-next-steps/501-for-further-reading]
+|image:button-continue-standard.png[link=../../05-path-next-steps/502-for-further-reading]
 |image:button-continue-developer.png[link=../../03-path-application-development/305-app-tracing-with-jaeger-and-x-ray]
 |=====
     
diff --git a/03-path-application-development/306-app-managment-with-helm/readme.adoc b/03-path-application-development/306-app-managment-with-helm/readme.adoc
@@ -2,7 +2,7 @@
 :toc:
 :icons:
 :linkcss:
-:imagesdir: ../resources/images
+:imagesdir: ../../resources/images
 
 https://github.com/kubernetes/helm[Helm] is a tool for managing https://github.com/kubernetes/charts[Kubernetes charts]. A chart is a collection of files that describe a related set of Kubernetes resources. Read more details in https://github.com/kubernetes/helm/blob/master/docs/charts.md[Charts introduction].
 
diff --git a/03-path-application-development/307-statefulsets-and-pvs/readme.adoc b/03-path-application-development/307-statefulsets-and-pvs/readme.adoc
@@ -2,7 +2,7 @@
 :toc:
 :icons:
 :linkcss:
-:imagesdir: ../resources/images
+:imagesdir: ../../resources/images
 
 In this section, we will review how to launch and manage applications using https://kubernetes.io/docs/concepts/abstractions/controllers/statefulsets/[StatefulSets] and https://kubernetes.io/docs/concepts/storage/persistent-volumes/[Persistent Volumes].
 
diff --git a/03-path-application-development/308-cicd-workflows/308-1-codesuite/README.adoc b/03-path-application-development/308-cicd-workflows/308-1-codesuite/README.adoc
@@ -2,7 +2,7 @@
 :toc:
 :icons:
 :linkcss:
-:imagesdir: ../../resources/images
+:imagesdir: ../../../resources/images
 
 = CodeSuite - Continuous Deployment Reference Architecture for Kubernetes
 
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
@@ -2,7 +2,7 @@
 :toc:
 :icons:
 :linkcss:
-:imagesdir: ../resources/images
+:imagesdir: ../../resources/images
 
 Separating application code from configuration is one of the factors when building an application using https://12factor.net/[12-factor]. This allows the same application to be deployed across multiple environments, such as dev, test, staging and production. It also allows the application to be more portable.
 
@@ -1003,3 +1003,15 @@ More details about the Docker image used in the Pod is at https://github.com/aru
   vault: HelloWorld
 
 
+You are now ready to continue on with the workshop!
+
+:frame: none
+:grid: none
+:valign: top
+
+[align="center", cols="2", grid="none", frame="none"]
+|=====
+|image:button-continue-developer.png[link=../../04-path-security-and-networking/402-authentication-and-authorization/]
+|image:button-continue-operations.png[link=../../04-path-security-and-networking/402-authentication-and-authorization/]
+|=====
+
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
@@ -2,7 +2,7 @@
 :toc:
 :icons:
 :linkcss:
-:imagesdir: ../resources/images
+:imagesdir: ../../resources/images
 
 AWS uses Identity and Access Management (IAM) roles to manage authentication and authorization for AWS Services.  An IAM role is an IAM entity that defines a set of permissions for making AWS service requests. For more information about IAM, please see link:https://aws.amazon.com/iam/details/[here].
 
@@ -405,3 +405,15 @@ An error occurred (InvalidAccessKeyId) when calling the ListBuckets operation: T
 command terminated with exit code 255
 ```
 
+You are now ready to continue on with the workshop!
+
+:frame: none
+:grid: none
+:valign: top
+
+[align="center", cols="2", grid="none", frame="none"]
+|=====
+|image:button-continue-developer.png[link=../../04-path-security-and-networking/403-admission-policy/]
+|image:button-continue-operations.png[link=../../04-path-security-and-networking/403-admission-policy/]
+|=====
+
diff --git a/04-path-security-and-networking/403-admission-policy/readme.adoc b/04-path-security-and-networking/403-admission-policy/readme.adoc
@@ -1,9 +1,13 @@
 
 = Admission Control for Kubernetes on AWS
+:toc:
+:icons:
+:linkcss:
+:imagesdir: ../../resources/images
+
 Doc Writer <tim@styra.com>
 v1.0, 2018-01-17
 
-
 Kubernetes https://kubernetes.io/docs/admin/admission-controllers/[Admission Controllers]
 perform *semantic validation* of resources during create, update, and delete operations.
 In Kubernetes 1.8+, you can use the http://www.openpolicyagent.org/[Open Policy Agent] and
@@ -406,3 +410,17 @@ decisions in Kubernetes clusters without modifying or recompiling any
 Kubernetes components. Furthermore, once Kubernetes is configured to use OPA as
 an External Admission Controller, policies can be modified on-the-fly to
 satisfy changing operational requirements.
+
+You are now ready to continue on with the workshop!
+
+:frame: none
+:grid: none
+:valign: top
+
+[align="center", cols="2", grid="none", frame="none"]
+|=====
+|image:button-continue-developer.png[link=../../04-path-security-and-networking/404-network-policies/]
+|image:button-continue-operations.png[link=../../04-path-security-and-networking/404-network-policies/]
+|=====
+
+
diff --git a/04-path-security-and-networking/404-network-policies/readme.adoc b/04-path-security-and-networking/404-network-policies/readme.adoc
@@ -2,7 +2,7 @@
 :toc:
 :icons:
 :linkcss:
-:imagesdir: ../resources/images
+:imagesdir: ../../resources/images
 
 
 == What is Network Policy?
@@ -173,5 +173,19 @@ test                100% |******************************************************
 
 Remove all the resources and the namespace using the command:
 
-  \ # kubectl delete ns ns-1
-  namespace "ns-1" deleted
+   $ kubectl delete ns ns-1
+   namespace "ns-1" deleted
+
+You are now ready to continue on with the workshop!
+
+:frame: none
+:grid: none
+:valign: top
+
+[align="center", cols="2", grid="none", frame="none"]
+|=====
+|image:button-continue-developer.png[link=../../04-path-security-and-networking/405-ingress-controllers/]
+|image:button-continue-operations.png[link=../../04-path-security-and-networking/405-ingress-controllers/]
+|=====
+
+  
diff --git a/04-path-security-and-networking/405-ingress-controllers/readme.adoc b/04-path-security-and-networking/405-ingress-controllers/readme.adoc
@@ -2,7 +2,7 @@
 :toc:
 :icons:
 :linkcss:
-:imagesdir: ../resources/images
+:imagesdir: ../../resources/images
 
 This chapter explains how to apply both Nginx and AWS ALB Ingress Controllers to a Kubernetes cluster.
 These controllers allow you to set rules that control the routing of external traffic to the services in your Kubernetes cluster.
@@ -551,11 +551,26 @@ white background to green background. If you modify the
 `zalando.org/backend-weights` annotation you can control the chance
 that you will hit the v1 or the v2 application. Use kubectl annotate to change this:
 
-        kubectl annotate ingress demo-traffic-switching zalando.org/backend-weights='{"demo-app-v1": 20, "demo-app-v2": 80}'
+        $ kubectl annotate ingress demo-traffic-switching zalando.org/backend-weights='{"demo-app-v1": 20, "demo-app-v2": 80}'
 
 
 === Cleanup
 
         for f in templates/sample*; do kubectl delete -f $f; done
         kubectl delete -f templates/skipper-ingress-daemonset.yaml
         kubectl delete -f templates/kube-aws-ingress-controller-deployment.yaml
+
+
+You are now ready to continue on with the workshop!
+
+:frame: none
+:grid: none
+:valign: top
+
+[align="center", cols="2", grid="none", frame="none"]
+|=====
+|image:button-continue-developer.png[link=../../04-path-security-and-networking/406-coredns/]
+|image:button-continue-operations.png[link=../../04-path-security-and-networking/406-coredns/]
+|=====
+
+        
diff --git a/04-path-security-and-networking/406-coredns/readme.adoc b/04-path-security-and-networking/406-coredns/readme.adoc
@@ -2,7 +2,7 @@
 :toc:
 :icons:
 :linkcss:
-:imagesdir: ../resources/images
+:imagesdir: ../../resources/images
 
 https://github.com/kubernetes/kubernetes/tree/master/cluster/addons/dns[Kube-DNS] is a Kubernetes cluster add-on that is launched as part of the cluster creation. It schedules a DNS Pod and Service on the cluster, and configures the kubelets to tell other pods and containers to use the DNS service IP's to resolve DNS names. This DNS server utilizes the libraries from SkyDNS to serve DNS requests for Kubernetes Pods and Services.
 
@@ -256,3 +256,16 @@ If you no longer need Kube-DNS, then the Deployment can be deleted:
 	kubectl delete deployment kube-dns -n kube-system
 
 This will delete the pod, and the CoreDNS pod will continue to serve all the DNS requests.
+
+You are now ready to continue on with the workshop!
+
+:frame: none
+:grid: none
+:valign: top
+
+[align="center", cols="2", grid="none", frame="none"]
+|=====
+|image:button-continue-developer.png[link=../../05-path-next-steps/501-k8s-best-practices/]
+|image:button-continue-operations.png[link=../../05-path-next-steps/501-k8s-best-practices/]
+|=====
+
diff --git a/05-path-next-steps/501-k8s-best-practices/readme.adoc b/05-path-next-steps/501-k8s-best-practices/readme.adoc
@@ -110,3 +110,16 @@ Coming soon
 
 == Integrating external Services
 Coming soon
+
+
+You are now ready to continue on with the workshop!
+
+:frame: none
+:grid: none
+:valign: top
+
+[align="center", cols="2", grid="none", frame="none"]
+|=====
+|image:button-continue-developer.png[link=../../05-path-next-steps/502-for-further-reading/]
+|image:button-continue-operations.png[link=../../05-path-next-steps/502-for-further-reading/]
+|=====
diff --git a/05-path-next-steps/502-for-further-reading/readme.adoc b/05-path-next-steps/502-for-further-reading/readme.adoc
@@ -2,26 +2,33 @@
 :toc:
 :icons:
 :linkcss:
-:imagesdir: ../resources/images
+:imagesdir: ../../resources/images
 
-=== Workshop cleanup
+Congratulations! You have completed the Kubernetes the AWSome Way! workshop.
+We hope you have enjoyed learning more about Kuberentes on AWS.
 
-==== Delete kubernetes cluster resources
+Please remember to clean up any resources spun up during this workshop!
+
+== Workshop cleanup
+
+=== Delete kubernetes cluster resources
 
 In your Cloud9 IDE, check if there are any running kubernetes cluster
 
-  kops get cluster
+   $ kops get cluster
+
+Delete kubernetes cluster _(replace `example.cluster.k8s.local` with your specific cluster name)_
 
-Delete kubernetes cluster
+   $ kops delete cluster example.cluster.k8s.local --yes
 
-  kops delete cluster example.cluster.k8s.local --yes
+Wait until all the resources are deleted by kops.
 
-Wait until all resources are deleted by kops
+=== Delete Cloud9 Development Environment
 
-==== Delete Cloud9
+Go to the AWS CloudFormation console, right-click the 'k8s-workshop' template and select "Delete Stack"
 
-Go to CloudFormation console, right click template with name 'k8s-workshop' and select #Delete Stack
+This should delete all the resources associated with this workshop.
 
-This should delete all the resources associated with this workshop
+== Further Reading
 
-====
+* link:https://aws.amazon.com/eks[Amazon Elastic Container Service for Kubernetes (EKS)]
