Merge pull request #6 from mpon/feature/fargate_spot

mpon · web-flow · commit 31edb1ce8aac · 2020-08-03T01:06:52.000+09:00
Support Fargate Spot
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ This repository is just an example, but we are aiming for a level that can be us
 You can use this repository to try creating your own AWS infrastructure!
 
 - [x] VPC
-- [x] ECS on Fargate
+- [x] ECS on Fargate and Fargate Spot with capacity provider
 - [x] ECS Application Auto Scaling by Target Tracking Scaling Policies
 - [x] ECS Scheduled Task
 - [x] CodePipline triggerd by GitHub
@@ -18,6 +18,7 @@ You can use this repository to try creating your own AWS infrastructure!
 ![structure](docs/aws.drawio.svg)
 ![pipeline](docs/pipeline.drawio.svg)
 ![ecs](docs/ecs.png)
+![fargate_spot](docs/fargate_spot.png)
 ![scheduled_task](docs/scheduled_task.png)
 ![codepipeline](docs/codepipeline.png)
 
diff --git a/docs/fargate_spot.png b/docs/fargate_spot.png
diff --git a/terraform/common/Makefile b/terraform/common/Makefile
@@ -1,4 +1,5 @@
 init:
+	tfenv install
 	terraform init \
 		-backend-config="bucket=${TF_VAR_remote_backend}" \
 		-backend-config="region=${AWS_DEFAULT_REGION}"
diff --git a/terraform/dev/Makefile b/terraform/dev/Makefile
@@ -1,4 +1,5 @@
 init:
+	tfenv install
 	terraform init \
 		-backend-config="bucket=${TF_VAR_remote_backend}" \
 		-backend-config="region=${AWS_DEFAULT_REGION}"
diff --git a/terraform/prod/Makefile b/terraform/prod/Makefile
@@ -1,4 +1,5 @@
 init:
+	tfenv install
 	terraform init \
 		-backend-config="bucket=${TF_VAR_remote_backend}" \
 		-backend-config="region=${AWS_DEFAULT_REGION}"
diff --git a/terraform/prod/ecs_cluster.tf b/terraform/prod/ecs_cluster.tf
@@ -1,5 +1,6 @@
 resource "aws_ecs_cluster" "cluster" {
-  name = "${local.env}-cluster"
+  name               = "${local.env}-cluster"
+  capacity_providers = ["FARGATE", "FARGATE_SPOT"]
 }
 
 module "ecs_task_execution_iam" {
diff --git a/terraform/prod/ecs_service_api.tf b/terraform/prod/ecs_service_api.tf
@@ -47,7 +47,6 @@ resource "aws_ecs_service" "api" {
   cluster         = aws_ecs_cluster.cluster.id
   task_definition = aws_ecs_task_definition.api.arn
   desired_count   = 0 # desired_count will be updated by autoscaling
-  launch_type     = "FARGATE"
 
   load_balancer {
     target_group_arn = aws_lb_target_group.api_blue.arn
@@ -64,6 +63,17 @@ resource "aws_ecs_service" "api" {
     type = "CODE_DEPLOY"
   }
 
+  capacity_provider_strategy {
+    capacity_provider = "FARGATE"
+    weight            = 2
+    base              = 1
+  }
+
+  capacity_provider_strategy {
+    capacity_provider = "FARGATE_SPOT"
+    weight            = 1
+  }
+
   lifecycle {
     # This parameter will be chaned by CodeDeploy
     ignore_changes = [
@@ -86,8 +96,8 @@ module "api_autoscaling" {
 
   cluster_name     = aws_ecs_cluster.cluster.name
   service_name     = aws_ecs_service.api.name
-  min_capacity     = 1
-  max_capacity     = 1
+  min_capacity     = 3
+  max_capacity     = 6
   cpu_target_value = 60
   role_arn         = data.terraform_remote_state.common.outputs.ecs_application_autoscaling_role_arn
 }
diff --git a/terraform/prod/ecs_service_web.tf b/terraform/prod/ecs_service_web.tf
@@ -47,7 +47,6 @@ resource "aws_ecs_service" "web" {
   cluster         = aws_ecs_cluster.cluster.id
   task_definition = aws_ecs_task_definition.web.arn
   desired_count   = 0 # desired_count will be updated by autoscaling
-  launch_type     = "FARGATE"
 
   load_balancer {
     target_group_arn = aws_lb_target_group.web_blue.arn
@@ -64,6 +63,17 @@ resource "aws_ecs_service" "web" {
     type = "CODE_DEPLOY"
   }
 
+  capacity_provider_strategy {
+    capacity_provider = "FARGATE"
+    weight            = 2
+    base              = 1
+  }
+
+  capacity_provider_strategy {
+    capacity_provider = "FARGATE_SPOT"
+    weight            = 1
+  }
+
   lifecycle {
     # This parameter will be chaned by CodeDeploy
     ignore_changes = [
@@ -86,8 +96,8 @@ module "web_autoscaling" {
 
   cluster_name     = aws_ecs_cluster.cluster.name
   service_name     = aws_ecs_service.web.name
-  min_capacity     = 1
-  max_capacity     = 1
+  min_capacity     = 3
+  max_capacity     = 6
   cpu_target_value = 60
   role_arn         = data.terraform_remote_state.common.outputs.ecs_application_autoscaling_role_arn
 }
diff --git a/terraform/stg/Makefile b/terraform/stg/Makefile
@@ -1,4 +1,5 @@
 init:
+	tfenv install
 	terraform init \
 		-backend-config="bucket=${TF_VAR_remote_backend}" \
 		-backend-config="region=${AWS_DEFAULT_REGION}"
diff --git a/terraform/stg/ecs_cluster.tf b/terraform/stg/ecs_cluster.tf
@@ -1,5 +1,6 @@
 resource "aws_ecs_cluster" "cluster" {
-  name = "${local.env}-cluster"
+  name               = "${local.env}-cluster"
+  capacity_providers = ["FARGATE", "FARGATE_SPOT"]
 }
 
 module "ecs_task_execution_iam" {
diff --git a/terraform/stg/ecs_service_api.tf b/terraform/stg/ecs_service_api.tf
@@ -47,7 +47,6 @@ resource "aws_ecs_service" "api" {
   cluster         = aws_ecs_cluster.cluster.id
   task_definition = aws_ecs_task_definition.api.arn
   desired_count   = 0 # desired_count will be updated by autoscaling
-  launch_type     = "FARGATE"
 
   load_balancer {
     target_group_arn = aws_lb_target_group.api_blue.arn
@@ -64,6 +63,11 @@ resource "aws_ecs_service" "api" {
     type = "CODE_DEPLOY"
   }
 
+  capacity_provider_strategy {
+    capacity_provider = "FARGATE_SPOT"
+    weight            = 100
+  }
+
   lifecycle {
     # This parameter will be chaned by CodeDeploy
     ignore_changes = [
diff --git a/terraform/stg/ecs_service_web.tf b/terraform/stg/ecs_service_web.tf
@@ -47,7 +47,6 @@ resource "aws_ecs_service" "web" {
   cluster         = aws_ecs_cluster.cluster.id
   task_definition = aws_ecs_task_definition.web.arn
   desired_count   = 0 # desired_count will be updated by autoscaling
-  launch_type     = "FARGATE"
 
   load_balancer {
     target_group_arn = aws_lb_target_group.web_blue.arn
@@ -64,6 +63,11 @@ resource "aws_ecs_service" "web" {
     type = "CODE_DEPLOY"
   }
 
+  capacity_provider_strategy {
+    capacity_provider = "FARGATE_SPOT"
+    weight            = 100
+  }
+
   lifecycle {
     # This parameter will be chaned by CodeDeploy
     ignore_changes = [

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`init:`
	`2`	`+ tfenv install`
`2`	`3`	`terraform init \`
`3`	`4`	`-backend-config="bucket=${TF_VAR_remote_backend}" \`
`4`	`5`	`-backend-config="region=${AWS_DEFAULT_REGION}"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`resource "aws_ecs_cluster" "cluster" {`
`2`		`- name = "${local.env}-cluster"`
	`2`	`+ name = "${local.env}-cluster"`
	`3`	`+ capacity_providers = ["FARGATE", "FARGATE_SPOT"]`
`3`	`4`	`}`
`4`	`5`
`5`	`6`	`module "ecs_task_execution_iam" {`