Skip to content

Commit d96999e

Browse files
authored
Merge pull request aws-samples#337 from scottmalkie/master
Add path buttons to 20x, 30x, 40x, and 50x sections; Fix imagesdir links
2 parents 6a9b026 + e1c5ced commit d96999e

File tree

31 files changed

+311
-33
lines changed

31 files changed

+311
-33
lines changed

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,3 +317,16 @@ Convenient link for other dashboards are listed below:
317317
Remove all the installed components:
318318
319319
kubectl delete -f templates/prometheus/prometheus-bundle.yaml
320+
321+
322+
You are now ready to continue on with the workshop!
323+
324+
:frame: none
325+
:grid: none
326+
:valign: top
327+
328+
[align="center", cols="2", grid="none", frame="none"]
329+
|=====
330+
|image:button-continue-standard.png[link=../../02-path-working-with-clusters/202-service-mesh]
331+
|image:button-continue-operations.png[link=../../02-path-working-with-clusters/202-service-mesh]
332+
|=====

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,3 +464,16 @@ Some errors may appear in the output when deleting Istio. These are related to I
464464
kubectl get all
465465
kubectl get all --namespace istio-system
466466

467+
468+
You are now ready to continue on with the workshop!
469+
470+
:frame: none
471+
:grid: none
472+
:valign: top
473+
474+
[align="center", cols="2", grid="none", frame="none"]
475+
|=====
476+
|image:button-continue-standard.png[link=../../02-path-working-with-clusters/203-cluster-upgrades]
477+
|image:button-continue-operations.png[link=../../02-path-working-with-clusters/203-cluster-upgrades]
478+
|=====
479+

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,3 +288,14 @@ Upgrading cluster using blue/green method is considered more conservative in nat
288288
Availability for your application into account. You would setup two k8s cluster, one with 1.6.10
289289
version and second with 1.7.2 and migrate your pod deployments and services into new cluster.
290290

291+
You are now ready to continue on with the workshop!
292+
293+
:frame: none
294+
:grid: none
295+
:valign: top
296+
297+
[align="center", cols="2", grid="none", frame="none"]
298+
|=====
299+
|image:button-continue-standard.png[link=../../03-path-application-development/302-app-discovery]
300+
|image:button-continue-operations.png[link=../../02-path-working-with-clusters/204-cluster-logging-with-EFK]
301+
|=====

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,3 +237,15 @@ kubectl delete ns logging
237237
aws es delete-elasticsearch-domain --domain-name kubernetes-logs
238238
aws logs delete-log-group --log-group-name kubernetes-logs
239239
```
240+
241+
You are now ready to continue on with the workshop!
242+
243+
:frame: none
244+
:grid: none
245+
:valign: top
246+
247+
[align="center", cols="1", grid="none", frame="none"]
248+
|=====
249+
|image:button-continue-operations.png[link=../../02-path-working-with-clusters/204-cluster-logging-with-EFK]
250+
|=====
251+

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,3 +335,13 @@ ip-172-20-44-50.eu-central-1.compute.internal 18m 0% 1076Mi
335335
ip-172-20-75-132.eu-central-1.compute.internal 27m 1% 1723Mi 44%
336336
```
337337

338+
You are now ready to continue on with the workshop!
339+
340+
:frame: none
341+
:grid: none
342+
:valign: top
343+
344+
[align="center", cols="1", grid="none", frame="none"]
345+
|=====
346+
|image:button-continue-operations.png[link=../../02-path-working-with-clusters/205-cluster-autoscaling]
347+
|=====

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,15 @@ NOTE: https://kubernetes.io/docs/setup/independent/create-cluster-kubeadm/[kubea
3939
== Terraform
4040

4141
The template and instructions need to be added: https://github.com/arun-gupta/kubernetes-aws-workshop/issues/135
42+
43+
44+
You are now ready to continue on with the workshop!
45+
46+
:frame: none
47+
:grid: none
48+
:valign: top
49+
50+
[align="center", cols="1", grid="none", frame="none"]
51+
|=====
52+
|image:button-continue-operations.png[link=../../04-path-security-and-networking/401-configmaps-and-secrets]
53+
|=====

03-path-application-development/301-local-development/readme.adoc

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
:toc:
33
:icons:
44
:linkcss:
5-
:imagesdir: ../resources/images
5+
:imagesdir: ../../resources/images
66

77
For local development purposes, you can create a one-node cluster using https://github.com/kubernetes/minikube[Minikube].
88
Hosted solutions or cloud-based solutions provide the scalability and higher availability for staging or production purposes.
@@ -297,3 +297,15 @@ The cluster can be shutdown using the following command:
297297
$ minikube stop
298298
Stopping local Kubernetes cluster...
299299
Machine stopped.
300+
301+
302+
You are now ready to continue on with the workshop!
303+
304+
:frame: none
305+
:grid: none
306+
:valign: top
307+
308+
[align="center", cols="1", grid="none", frame="none"]
309+
|=====
310+
|image:button-continue-developer.png[link=../../03-path-application-development/302-app-directory]
311+
|=====

03-path-application-development/302-app-discovery/readme.adoc

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
:toc:
33
:icons:
44
:linkcss:
5-
:imagesdir: ../resources/images
5+
:imagesdir: ../../resources/images
66

77
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.
88

@@ -137,3 +137,15 @@ Delete the application with this command:
137137

138138
$ kubectl delete -f templates/app.yml
139139

140+
141+
You are now ready to continue on with the workshop!
142+
143+
:frame: none
144+
:grid: none
145+
:valign: top
146+
147+
[align="center", cols="2", grid="none", frame="none"]
148+
|=====
149+
|image:button-continue-standard.png[link=../../03-path-application-development/303-app-update]
150+
|image:button-continue-developer.png[link=../../03-path-application-development/303-app-update]
151+
|=====

03-path-application-development/303-app-update/readme.adoc

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
:toc:
33
:icons:
44
:linkcss:
5-
:imagesdir: ../resources/images
5+
:imagesdir: ../../resources/images
66

77
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.
88

@@ -531,3 +531,14 @@ https://github.com/zalando-incubator/kube-ingress-aws-controller[Kubernetes Ingr
531531
deployment "app-ingress-controller" created
532532

533533

534+
You are now ready to continue on with the workshop!
535+
536+
:frame: none
537+
:grid: none
538+
:valign: top
539+
540+
[align="center", cols="2", grid="none", frame="none"]
541+
|=====
542+
|image:button-continue-standard.png[link=../../03-path-application-development/304-app-scaling]
543+
|image:button-continue-developer.png[link=../../03-path-application-development/304-app-scaling]
544+
|=====

03-path-application-development/304-app-scaling/readme.adoc

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
:toc:
33
:icons:
44
:linkcss:
5-
:imagesdir: ../resources/images
5+
:imagesdir: ../../resources/images
66

77
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.
88

@@ -104,6 +104,18 @@ webapp Deployment/webapp 0% / 10% 1 10 1 17m
104104

105105
== Cleanup
106106

107-
kubectl delete hpa webapp
108-
kubectl delete deployment load-generator
109-
kubectl delete deployment webapp
107+
$ kubectl delete hpa/webapp deploy/load-generator deploy/webapp
108+
109+
110+
You are now ready to continue on with the workshop!
111+
112+
:frame: none
113+
:grid: none
114+
:valign: top
115+
116+
[align="center", cols="2", grid="none", frame="none"]
117+
|=====
118+
|image:button-continue-standard.png[link=../../05-path-next-steps/502-for-further-reading]
119+
|image:button-continue-developer.png[link=../../03-path-application-development/305-app-tracing-with-jaeger-and-x-ray]
120+
|=====
121+

0 commit comments

Comments
 (0)