Skip to content

Commit 676d47d

Browse files
committed
minor fixes, moved Workshop cleanup up to the Index page rather than Further Reading
1 parent d96999e commit 676d47d

File tree

5 files changed

+79
-27
lines changed

5 files changed

+79
-27
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,5 +307,5 @@ You are now ready to continue on with the workshop!
307307

308308
[align="center", cols="1", grid="none", frame="none"]
309309
|=====
310-
|image:button-continue-developer.png[link=../../03-path-application-development/302-app-directory]
311-
|=====
310+
|image:button-continue-developer.png[link=../../03-path-application-development/302-app-discovery]
311+
|=====

05-path-next-steps/502-for-further-reading/readme.adoc

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
= For Further Reading
1+
= For Further Reading
22
:toc:
33
:icons:
44
:linkcss:
@@ -9,25 +9,7 @@ We hope you have enjoyed learning more about Kuberentes on AWS.
99

1010
Please remember to clean up any resources spun up during this workshop!
1111

12-
== Workshop cleanup
13-
14-
=== Delete kubernetes cluster resources
15-
16-
In your Cloud9 IDE, check if there are any running kubernetes cluster
17-
18-
$ kops get cluster
19-
20-
Delete kubernetes cluster _(replace `example.cluster.k8s.local` with your specific cluster name)_
21-
22-
$ kops delete cluster example.cluster.k8s.local --yes
23-
24-
Wait until all the resources are deleted by kops.
25-
26-
=== Delete Cloud9 Development Environment
27-
28-
Go to the AWS CloudFormation console, right-click the 'k8s-workshop' template and select "Delete Stack"
29-
30-
This should delete all the resources associated with this workshop.
12+
You can find instructions for Workshop Cleanup in relevant Index pages
3113

3214
== Further Reading
3315

developer-path.adoc

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
= Kubernetes the AWSome Way!
22
:icons:
33
:linkattrs:
4-
:imagesdir: ../../resources/images
4+
:imagesdir: resources/images
55

66
image:kubernetes-aws-smile.png[alt="kubernetes and aws logos", align="left",width=420]
77

@@ -36,4 +36,27 @@ This path is suitable for individual developers or development teams interested
3636
|link:05-path-next-steps/502-for-further-reading[502: For Further Reading]
3737
|=====
3838

39-
NOTE: You will incur charges as you go through these workshop guides as it will exceed the link:http://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/free-tier-limits.html[limits of AWS free tier]. An estimate of charges (<$20/day) can be seen at this link:https://calculator.s3.amazonaws.com/index.html#r=FRA&s=EC2&key=calc-E6DBD6F1-C45D-4827-93F8-D9B18C5994B0[simple monthly calculator]
39+
== Workshop Cleanup
40+
41+
Once you have finished with the workshop, please don't forget to spin down your cluster or you will incur additional charges.
42+
(We will also remind you at the end!)
43+
44+
==== Delete Kubernetes cluster resources
45+
46+
In your Cloud9 IDE, check if there are any running kubernetes cluster
47+
48+
$ kops get cluster
49+
50+
Delete kubernetes cluster
51+
52+
$ kops delete cluster example.cluster.k8s.local --yes
53+
54+
Wait until all resources are deleted by kops
55+
56+
==== Delete Cloud9 Envionment
57+
58+
Go to CloudFormation console, right click template with name 'k8s-workshop' and select 'Delete Stack'
59+
60+
This should delete all the resources associated with this workshop
61+
62+
NOTE: You will incur charges as you go through these workshop guides as it will exceed the link:http://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/free-tier-limits.html[limits of AWS free tier]. An estimate of charges (<$20/day) can be seen at this link:https://calculator.s3.amazonaws.com/index.html#r=FRA&s=EC2&key=calc-E6DBD6F1-C45D-4827-93F8-D9B18C5994B0[simple monthly calculator]

operations-path.adoc

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
= Kubernetes the AWSome Way!
22
:icons:
33
:linkattrs:
4-
:imagesdir: ../../resources/images
4+
:imagesdir: resources/images
55

66
image:kubernetes-aws-smile.png[alt="kubernetes and aws logos", align="left",width=420]
77

@@ -36,4 +36,27 @@ This path is suitable for operations teams interested in deploying, managing, an
3636
|link:05-path-next-steps/502-for-further-reading[502: For Further Reading]
3737
|=====
3838

39-
NOTE: You will incur charges as you go through these workshop guides as it will exceed the link:http://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/free-tier-limits.html[limits of AWS free tier]. An estimate of charges (<$20/day) can be seen at this link:https://calculator.s3.amazonaws.com/index.html#r=FRA&s=EC2&key=calc-E6DBD6F1-C45D-4827-93F8-D9B18C5994B0[simple monthly calculator]
39+
== Workshop Cleanup
40+
41+
Once you have finished with the workshop, please don't forget to spin down your cluster or you will incur additional charges.
42+
(We will also remind you at the end!)
43+
44+
==== Delete Kubernetes cluster resources
45+
46+
In your Cloud9 IDE, check if there are any running kubernetes cluster
47+
48+
$ kops get cluster
49+
50+
Delete kubernetes cluster
51+
52+
$ kops delete cluster example.cluster.k8s.local --yes
53+
54+
Wait until all resources are deleted by kops
55+
56+
==== Delete Cloud9 Envionment
57+
58+
Go to CloudFormation console, right click template with name 'k8s-workshop' and select 'Delete Stack'
59+
60+
This should delete all the resources associated with this workshop
61+
62+
NOTE: You will incur charges as you go through these workshop guides as it will exceed the link:http://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/free-tier-limits.html[limits of AWS free tier]. An estimate of charges (<$20/day) can be seen at this link:https://calculator.s3.amazonaws.com/index.html#r=FRA&s=EC2&key=calc-E6DBD6F1-C45D-4827-93F8-D9B18C5994B0[simple monthly calculator]

standard-path.adoc

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
= Kubernetes the AWSome Way!
22
:icons:
33
:linkattrs:
4-
:imagesdir: ../../resources/images
4+
:imagesdir: resources/images
55

66
image:kubernetes-aws-smile.png[alt="kubernetes and aws logos", align="left",width=420]
77

@@ -27,4 +27,28 @@ image:kubernetes-aws-smile.png[alt="kubernetes and aws logos", align="left",widt
2727
|link:05-path-next-steps/502-for-further-reading[502: For Further Reading]
2828
|=====
2929

30+
31+
== Workshop Cleanup
32+
33+
Once you have finished with the workshop, please don't forget to spin down your cluster or you will incur additional charges.
34+
(We will also remind you at the end!)
35+
36+
==== Delete Kubernetes cluster resources
37+
38+
In your Cloud9 IDE, check if there are any running kubernetes cluster
39+
40+
$ kops get cluster
41+
42+
Delete kubernetes cluster
43+
44+
$ kops delete cluster example.cluster.k8s.local --yes
45+
46+
Wait until all resources are deleted by kops
47+
48+
==== Delete Cloud9 Envionment
49+
50+
Go to CloudFormation console, right click template with name 'k8s-workshop' and select 'Delete Stack'
51+
52+
This should delete all the resources associated with this workshop
53+
3054
NOTE: You will incur charges as you go through these workshop guides as it will exceed the link:http://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/free-tier-limits.html[limits of AWS free tier]. An estimate of charges (<$20/day) can be seen at this link:https://calculator.s3.amazonaws.com/index.html#r=FRA&s=EC2&key=calc-E6DBD6F1-C45D-4827-93F8-D9B18C5994B0[simple monthly calculator]

0 commit comments

Comments
 (0)