feat: Added support for persisting Atlantis state using EFS #247
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -110,6 +110,17 @@ locals { | |
| sort(compact(concat(var.allow_github_webhooks ? var.github_webhooks_cidr_blocks : [], var.whitelist_unauthenticated_cidr_blocks))), | ||
| 5 | ||
| ) | ||
|
|
||
| # break up user to uid and gid -- set both to 0 if null | ||
| uid = var.user == null ? 0 : split(":", var.user)[0] | ||
| gid = var.user == null ? 0 : split(":", var.user)[1] | ||
|
|
||
| # default mount points for efs if ephemeral storage is not enabled and mount points aren't specified | ||
| mount_points = var.enable_ephemeral_storage || length(var.mount_points) > 0 ? var.mount_points : [{ | ||
| containerPath = "/home/atlantis" | ||
| sourceVolume = "efs-storage" | ||
| readOnly = "false" | ||
| }] | ||
| } | ||
|
|
||
| data "aws_partition" "current" {} | ||
|
|
@@ -189,8 +200,9 @@ module "vpc" { | |
| private_subnets = var.private_subnets | ||
| public_subnets = var.public_subnets | ||
|
|
||
| enable_nat_gateway = true | ||
| single_nat_gateway = true | ||
| enable_dns_hostnames = !var.enable_ephemeral_storage | ||
|
|
||
| manage_default_security_group = var.manage_default_security_group | ||
| default_security_group_ingress = var.default_security_group_ingress | ||
|
|
@@ -355,6 +367,24 @@ module "atlantis_sg" { | |
| tags = merge(local.tags, var.atlantis_security_group_tags) | ||
| } | ||
|
|
||
| module "efs_sg" { | ||
| source = "terraform-aws-modules/security-group/aws//modules/nfs" | ||
| version = "v4.8.0" | ||
| count = var.enable_ephemeral_storage ? 0 : 1 | ||
|
|
||
| name = "${var.name}-efs" | ||
| vpc_id = local.vpc_id | ||
| description = "Security group allowing access to the EFS storage" | ||
|
|
||
| ingress_cidr_blocks = [var.cidr] | ||
| ingress_with_source_security_group_id = [{ | ||
| rule = "nfs-tcp", | ||
| source_security_group_id = module.atlantis_sg.security_group_id | ||
| }] | ||
|
|
||
| tags = local.tags | ||
| } | ||
|
|
||
| ################################################################################ | ||
| # ACM (SSL certificate) | ||
| ################################################################################ | ||
|
|
@@ -388,6 +418,35 @@ resource "aws_route53_record" "atlantis" { | |
| } | ||
| } | ||
|
|
||
| ################################################################################ | ||
| # EFS | ||
| ################################################################################ | ||
|
|
||
| resource "aws_efs_file_system" "this" { | ||
| count = var.enable_ephemeral_storage ? 0 : 1 | ||
MarkIannucci marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| creation_token = var.name | ||
| } | ||
|
|
||
| resource "aws_efs_mount_target" "this" { | ||
| # we coalescelist in order to specify the resource keys when we create the subnets using the VPC or they're specified for us. This works around the for_each value depends on attributes which can't be determined until apply error | ||
| for_each = zipmap(coalescelist(var.private_subnets, var.private_subnet_ids), local.private_subnet_ids) | ||
|
|
||
| file_system_id = aws_efs_file_system.this[0].id | ||
|
There was a problem hiding this comment. @MarkIannucci Unfortunately this is not working if I want to have there is no condition for
Contributor
Author
There was a problem hiding this comment. @borissavelev , thank you for the bug report. I'm sorry about the problem. I created #254 to track the resolution. |
||
| subnet_id = each.value | ||
| security_groups = [module.efs_sg[0].security_group_id, module.atlantis_sg.security_group_id] | ||
| } | ||
|
|
||
| resource "aws_efs_access_point" "this" { | ||
| count = var.enable_ephemeral_storage ? 0 : 1 | ||
|
|
||
| file_system_id = aws_efs_file_system.this[0].id | ||
| posix_user { | ||
| gid = local.gid | ||
| uid = local.uid | ||
| } | ||
| } | ||
|
|
||
| ################################################################################ | ||
| # ECS | ||
| ################################################################################ | ||
|
|
@@ -521,7 +580,7 @@ module "container_definition_github_gitlab" { | |
| container_depends_on = var.container_depends_on | ||
| essential = var.essential | ||
| readonly_root_filesystem = var.readonly_root_filesystem | ||
| mount_points = local.mount_points | ||
| volumes_from = var.volumes_from | ||
|
|
||
| port_mappings = [ | ||
|
|
@@ -624,11 +683,29 @@ resource "aws_ecs_task_definition" "atlantis" { | |
|
|
||
| dynamic "ephemeral_storage" { | ||
| for_each = var.enable_ephemeral_storage ? [1] : [] | ||
|
|
||
| content { | ||
| size_in_gib = var.ephemeral_storage_size | ||
| } | ||
| } | ||
|
|
||
| dynamic "volume" { | ||
| for_each = var.enable_ephemeral_storage ? [] : [1] | ||
|
|
||
| content { | ||
| name = "efs-storage" | ||
| efs_volume_configuration { | ||
| file_system_id = aws_efs_file_system.this[0].id | ||
| transit_encryption = "ENABLED" | ||
| transit_encryption_port = 2999 | ||
| authorization_config { | ||
| access_point_id = aws_efs_access_point.this[0].id | ||
| iam = "ENABLED" | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| tags = local.tags | ||
| } | ||
|
|
||
|
|
@@ -676,6 +753,7 @@ resource "aws_ecs_service" "atlantis" { | |
|
|
||
| dynamic "capacity_provider_strategy" { | ||
| for_each = var.ecs_fargate_spot ? [true] : [] | ||
|
|
||
| content { | ||
| capacity_provider = "FARGATE_SPOT" | ||
| weight = 100 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
var.cidrcan be empty when is reusing existing VPCThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
probably
ingress_cidr_blocksis unnecessary here because later we haveingress_with_source_security_group_id