Skip to content

Commit

Permalink
Modules are removed and flow is flattned
Browse files Browse the repository at this point in the history
Since we now have main flow and an optional flow, removed module terminology.
  • Loading branch information
kvrajesh committed Oct 22, 2020
1 parent 9b506e0 commit ea8ba78
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 27 deletions.
3 changes: 2 additions & 1 deletion content/ecs-spot-capacity-providers/Introduction/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ weight = 10
+++


If you're already familiar with the below concepts or already have experience with operating ECS clusters, you can skip the introduction and move to the [**Modules**](/ecs-spot-capacity-providers/modules.html) section to start the workshop.
If you're already familiar with the below concepts or already have experience with operating ECS clusters, you can skip the introduction and proceed to [**Setup the workshop environment on AWS**](/ecs-spot-capacity-providers/workshopsetup.html) section to start the workshop.


{{% children %}}
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ do
done
```

***Congratulations***, your Cloud9 workspace setup is complete, and you can proceed to Module-1 of this workshop.
***Congratulations***, your Cloud9 workspace setup is complete, and you can proceed to next steps of this workshop.
2 changes: 0 additions & 2 deletions content/ecs-spot-capacity-providers/before/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@ To start the workshop, follow one of the following pages, depending on whether y

{{% children %}}

Once you are done with either setup, continue to the [**Modules**](/ecs-spot-capacity-providers/modules.html) section. If you need an introduction to containers, Amazon ECS and AWS Fargate, continue to the [**Introduction section.**](/ecs-spot-capacity-providers/introduction.html)


Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
+++
title = "...At an AWS event"
weight = 5
weight = 1
+++

{{% notice warning %}}
Expand All @@ -19,7 +19,8 @@ If you are at an AWS event, an AWS acccount was created for you to use throughou

You are now logged in to the AWS console in an account that was created for you, and will be available only throughout the workshop run time.

You can now start the workshop by heading to [**Modules**](/ecs-spot-capacity-providers/modules.html)
You can now proceed to the the workshop steps [**Setup the workshop environment on AWS**](/ecs-spot-capacity-providers/workshopsetup.html)


Optional:
If you want to read through basic concepts on Amazon ECS before doing hands-on Modules, you may go to [**Introduction**](/ecs-spot-capacity-providers/introduction.html)
If you want to read through basic concepts on Amazon ECS before doing workshop steps, you may go to [**Introduction**](/ecs-spot-capacity-providers/introduction.html)
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
+++
title = "...On your own (self-paced)"
weight = 5
weight = 10
+++

### Running the workshop self-paced, in your own AWS account


To complete this workshop, have access to an AWS account with administrative permissions. An IAM user with administrator access (**arn:aws:iam::aws:policy/AdministratorAccess**) will do nicely.

You can start the workshop by heading to the [**Modules**](/ecs-spot-capacity-providers/modules.html) section. If you need an introduction to containers, Amazon ECS and AWS Fargate, continue to the [**Introduction section.**](/ecs-spot-capacity-providers/introduction.html)
If you need an introduction to containers, Amazon ECS and AWS Fargate, continue to the [**Introduction section.**](/ecs-spot-capacity-providers/introduction.html) OR

You can directly go to [**Setup the workshop environment on AWS**](/ecs-spot-capacity-providers/workshopsetup.html) section.

To avoid unwanted costs in your account, don't forget to go through the [**Cleanup step**](/ecs-spot-capacity-providers/cleanup.html) when you finish the workshop, or if you deploy the CloudFormation template but don't complete the workshop.
2 changes: 1 addition & 1 deletion content/ecs-spot-capacity-providers/module-1/_index.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: "Module-1: Cost optimizing ECS using Spot Instances with Auto Scaling groups Capacity Providers"
title: "Cost optimizing ECS using Spot Instances with Auto Scaling groups Capacity Providers"
chapter: true
weight: 20
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,3 @@ The task distribution after the scale in activity looks like below.
Earlier the task distribution was SPOT1 → 1, SPOT2 → 2, OD1 → 1, OD2 → 2.
The new distribution is SPOT2 → 1, OD1 → 1, OD2 → 2.

***Congratulations !!!*** you have successfully completed Module-1 and learnt how to create ASG CPs and schedule ECS services across Spot and On-demand CPs.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ echo "ECS_ENABLE_SPOT_INSTANCE_DRAINING=true" >> /etc/ecs/ecs.config
```
When Amazon ECS Spot Instance draining is enabled on the instance, ECS receives the Spot Instance interruption notice and places the instance in DRAINING status. When a container instance is set to DRAINING, Amazon ECS prevents new tasks from being scheduled for placement on the container instance [Click here](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/container-instance-spot.html) to learn more.

The web application (app.py) we used to buld docker image in this module shows two ways to handle the EC2 Spot interruption within a docker container. This allows you to perform actions such as preventing the processing of new work, checkpointing the progress of a batch job, or gracefully exiting the application to complete tasks such as ensuring database connections are properly closed
The web application (app.py) we used to buld docker image shows two ways to handle the EC2 Spot interruption within a docker container. This allows you to perform actions such as preventing the processing of new work, checkpointing the progress of a batch job, or gracefully exiting the application to complete tasks such as ensuring database connections are properly closed

In the first method, it checks the instance metadata service for spot interruption and display a message to web page notifying the users (this is, of course, just a demonstration and not for real-life scenarios).

Expand Down Expand Up @@ -69,3 +69,4 @@ is using. Specifying a stopTimeout value gives you time between the moment the t

• The **SIGTERM** signal must be received from within the container to perform any cleanup actions.

***Congratulations !!!*** you have leant how to create ASG CPs and schedule ECS services across Spot and On-demand CPs, You may proceed to next section(optional) to utilize Fargate Capacity providers.
2 changes: 1 addition & 1 deletion content/ecs-spot-capacity-providers/module-2/_index.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: "Module-2 (Optional): Saving costs using AWS Fargate Spot Capacity Providers"
title: "Saving costs using AWS Fargate Spot Capacity Providers (Optional)"
weight: 40
---

Expand Down
14 changes: 0 additions & 14 deletions content/ecs-spot-capacity-providers/modules.md

This file was deleted.

0 comments on commit ea8ba78

Please sign in to comment.