From d672613474610677d2738939c1cc40b79b190d31 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 21 Dec 2023 15:31:25 +0000 Subject: [PATCH] Bump terraform-dxw-dalmatian-infrastructure terraform project to v0.8.0 * Contains the ECS cluster feature * https://github.com/dxw/terraform-dxw-dalmatian-infrastructure/releases/tag/v0.8.0 --- bin/dalmatian | 2 +- data/tfvars-templates/infrastructure.tfvars | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/bin/dalmatian b/bin/dalmatian index 686066a..74ba0fe 100755 --- a/bin/dalmatian +++ b/bin/dalmatian @@ -192,7 +192,7 @@ then export GIT_DALMATIAN_INFRASTRUCTURE_REPO="terraform-dxw-dalmatian-infrastructure" export TERRAFORM_PROJECT_ACCOUNT_BOOTSTRAP_VERSION="v0.7.0" - export TERRAFORM_PROJECT_INFRASTRUCTURE_VERSION="v0.7.0" + export TERRAFORM_PROJECT_INFRASTRUCTURE_VERSION="v0.8.0" export AWS_CONFIG_FILE="$CONFIG_AWS_SSO_FILE" export AWS_PROFILE="dalmatian-main" diff --git a/data/tfvars-templates/infrastructure.tfvars b/data/tfvars-templates/infrastructure.tfvars index 89743f1..a557e30 100644 --- a/data/tfvars-templates/infrastructure.tfvars +++ b/data/tfvars-templates/infrastructure.tfvars @@ -7,6 +7,10 @@ route53_root_hosted_zone_domain_name = "" aws_profile_name_route53_root = "dalmatian-main" enable_infrastructure_route53_hosted_zone = false +# Dockerhub +infrastructure_dockerhub_email = "" +infrastructure_dockerhub_token = "" + # Infrastructure VPC infrastructure_vpc = false infrastructure_vpc_cidr_block = "10.0.0.0/16" @@ -31,3 +35,17 @@ infrastructure_vpc_network_acl_egress_custom_rules_public = [] infrastructure_vpc_network_acl_egress_custom_rules_private = [] infrastructure_vpc_network_acl_ingress_custom_rules_public = [] infrastructure_vpc_network_acl_ingress_custom_rules_private = [] + +# Infrastructure ECS Cluster +enable_infrastructure_ecs_cluster = false +infrastructure_ecs_cluster_ami_version = "*" +infrastructure_ecs_cluster_ebs_docker_storage_volume_size = 22 +infrastructure_ecs_cluster_ebs_docker_storage_volume_type = "gp3" +infrastructure_ecs_cluster_publicly_avaialble = false +infrastructure_ecs_cluster_instance_type = "t3.small" +infrastructure_ecs_cluster_termination_timeout = 900 +infrastructure_ecs_cluster_draining_lambda_enabled = false +infrastructure_ecs_cluster_draining_lambda_log_retention = 30 +infrastructure_ecs_cluster_min_size = 2 +infrastructure_ecs_cluster_max_size = 2 +infrastructure_ecs_cluster_max_instance_lifetime = 86400