diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl index e853b98..02e65c7 100644 --- a/.terraform.lock.hcl +++ b/.terraform.lock.hcl @@ -3,9 +3,10 @@ provider "registry.terraform.io/hashicorp/aws" { version = "5.8.0" - constraints = ">= 2.23.0, >= 3.72.0, >= 4.36.0, >= 4.47.0, >= 4.57.0, >= 4.59.0, >= 5.0.0, ~> 5.1" + constraints = ">= 2.23.0, >= 4.33.0, >= 4.36.0, >= 4.47.0, >= 4.57.0, >= 4.59.0, >= 5.0.0, ~> 5.1" hashes = [ "h1:CYWeH3ii7UQNc+rpNLixWilueA5sV9FF9kcBCz+D48U=", + "h1:vnjWfeuf4AflWsRq3ivVig8dR8PAg8BHTVyAtOzJ1yQ=", "zh:0974311d5e1becfdcbdae43d022d52689fdad32a4145659e56ac534bcb8cba02", "zh:100dc64a90fc0d36cf6e2882b4358fde17705edd8ab3c5f2c06d219c36b21565", "zh:467a86de8a7d77cde5c3386f9e82d7f1bf5972d1b3d177e797d1d9d2e87fd357", @@ -29,6 +30,7 @@ provider "registry.terraform.io/hashicorp/cloudinit" { constraints = ">= 2.0.0" hashes = [ "h1:Ar/DAbZQ9Nsj0BrqX6camrEE6U+Yq4E87DCNVqxqx8k=", + "h1:ocyv0lvfyvzW4krenxV5CL4Jq5DiA3EUfoy8DR6zFMw=", "zh:2487e498736ed90f53de8f66fe2b8c05665b9f8ff1506f751c5ee227c7f457d1", "zh:3d8627d142942336cf65eea6eb6403692f47e9072ff3fa11c3f774a3b93130b3", "zh:434b643054aeafb5df28d5529b72acc20c6f5ded24decad73b98657af2b53f4f", @@ -49,6 +51,7 @@ provider "registry.terraform.io/hashicorp/helm" { constraints = ">= 2.9.0, ~> 2.10" hashes = [ "h1:OFRsk+lMoRoNoJjJzRngH8hAq++Sb6LwrEKIjd7PeWA=", + "h1:rssAXPIBWhumMtToGhh63w1euKOgVOi7+9LK6qZtDUQ=", "zh:0717312baed39fb0a00576297241b69b419880cad8771bf72dec97ebdc96b200", "zh:0e0e287b4e8429a0700143c8159764502eba0b33b1d094bf0d4ef4d93c7802cb", "zh:4f74605377dab4065aaad35a2c5fa6186558c6e2e57b9058bdc8a62cf91857b9", @@ -68,6 +71,7 @@ provider "registry.terraform.io/hashicorp/kubernetes" { version = "2.22.0" constraints = ">= 2.10.0, >= 2.20.0, ~> 2.21" hashes = [ + "h1:DJr88+52tPK4Ft9xltF6YL+sRz8HWLP2ZOfFiKSB5Dc=", "h1:N2Nta6li+07oT02gcgLzAU4goGIWNXY2zqKUV/9rLLE=", "zh:1eac662b1f238042b2068401e510f0624efaf51fd6a4dd9c49d710a49d383b61", "zh:4c35651603493437b0b13e070148a330c034ac62c8967c2de9da6620b26adca4", @@ -89,6 +93,7 @@ provider "registry.terraform.io/hashicorp/time" { constraints = ">= 0.9.0" hashes = [ "h1:UHcDnIYFZ00uoou0TwPGMwOrE8gTkoRephIvdwDAK70=", + "h1:VxyoYYOCaJGDmLz4TruZQTSfQhvwEcMxvcKclWdnpbs=", "zh:00a1476ecf18c735cc08e27bfa835c33f8ac8fa6fa746b01cd3bcbad8ca84f7f", "zh:3007f8fc4a4f8614c43e8ef1d4b0c773a5de1dcac50e701d8abc9fdc8fcb6bf5", "zh:5f79d0730fdec8cb148b277de3f00485eff3e9cf1ff47fb715b1c969e5bbd9d4", @@ -108,6 +113,7 @@ provider "registry.terraform.io/hashicorp/tls" { version = "4.0.4" constraints = ">= 3.0.0" hashes = [ + "h1:GZcFizg5ZT2VrpwvxGBHQ/hO9r6g0vYdQqx3bFD3anY=", "h1:Wd3RqmQW60k2QWPN4sK5CtjGuO1d+CRNXgC+D4rKtXc=", "zh:23671ed83e1fcf79745534841e10291bbf34046b27d6e68a5d0aab77206f4a55", "zh:45292421211ffd9e8e3eb3655677700e3c5047f71d8f7650d2ce30242335f848", diff --git a/main.tf b/main.tf index 0086351..60e990e 100644 --- a/main.tf +++ b/main.tf @@ -15,6 +15,7 @@ module "comet_vpc" { source = "./modules/comet_vpc" count = var.enable_vpc ? 1 : 0 environment = var.environment + region = var.region eks_enabled = var.enable_eks single_nat_gateway = var.single_nat_gateway diff --git a/modules/comet_vpc/main.tf b/modules/comet_vpc/main.tf index 379b2a7..da8027f 100644 --- a/modules/comet_vpc/main.tf +++ b/modules/comet_vpc/main.tf @@ -39,4 +39,15 @@ module "vpc" { private_subnet_tags = var.eks_enabled ? { "kubernetes.io/role/internal-elb" = 1 } : null tags = local.tags +} + +resource "aws_vpc_endpoint" "s3" { + vpc_id = module.vpc.vpc_id + service_name = "com.amazonaws.${var.region}.s3" + vpc_endpoint_type = "Gateway" + route_table_ids = concat(module.vpc.private_route_table_ids, module.vpc.public_route_table_ids) + tags = merge( + local.tags, + { Name = "${local.resource_name}-s3-endpoint" } + ) } \ No newline at end of file diff --git a/modules/comet_vpc/variables.tf b/modules/comet_vpc/variables.tf index 427953f..a74c4aa 100644 --- a/modules/comet_vpc/variables.tf +++ b/modules/comet_vpc/variables.tf @@ -11,4 +11,9 @@ variable "eks_enabled" { variable "single_nat_gateway" { description = "Controls whether single NAT gateway used for all public subnets" type = bool +} + +variable "region" { + description = "AWS region to provision resources in" + type = string } \ No newline at end of file diff --git a/variables.tf b/variables.tf index bf08efc..9f6cda4 100644 --- a/variables.tf +++ b/variables.tf @@ -258,7 +258,7 @@ variable "elasticache_engine" { variable "elasticache_engine_version" { description = "Version number for ElastiCache engine" type = string - default = "7.1.0" + default = "7.1" } variable "elasticache_instance_type" { @@ -270,7 +270,7 @@ variable "elasticache_instance_type" { variable "elasticache_param_group_name" { description = "Name for the ElastiCache cluster parameter group" type = string - default = "default.redis5.0" + default = "default.redis7" } variable "elasticache_num_cache_nodes" {