From 758c6983bfe392c0798f4c45aa666abbde7062ce Mon Sep 17 00:00:00 2001 From: Sam Simpson Date: Thu, 18 Apr 2024 13:48:41 +0100 Subject: [PATCH 1/2] Import whitehall-csvs buckets from govuk-aws Migrated from app-whitehall-backend --- .../whitehall_csvs_s3.tf | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 terraform/deployments/govuk-publishing-infrastructure/whitehall_csvs_s3.tf diff --git a/terraform/deployments/govuk-publishing-infrastructure/whitehall_csvs_s3.tf b/terraform/deployments/govuk-publishing-infrastructure/whitehall_csvs_s3.tf new file mode 100644 index 000000000..1726eefaf --- /dev/null +++ b/terraform/deployments/govuk-publishing-infrastructure/whitehall_csvs_s3.tf @@ -0,0 +1,19 @@ +resource "aws_s3_bucket" "whitehall_csvs" { + bucket = "govuk-${var.govuk_environment}-whitehall-csvs" +} + +resource "aws_s3_bucket_logging" "whitehall_csvs" { + bucket = aws_s3_bucket.whitehall_csvs.id + target_bucket = "govuk-${var.govuk_environment}-aws-logging" + target_prefix = "s3/govuk-${var.govuk_environment}-whitehall-csvs/" +} + +import { + to = aws_s3_bucket.whitehall_csvs + id = "govuk-${var.govuk_environment}-whitehall-csvs" +} + +import { + to = aws_s3_bucket_logging.whitehall_csvs + id = "govuk-${var.govuk_environment}-whitehall-csvs" +} From 193af5690a530b83f825d8acb28de20f23538f3c Mon Sep 17 00:00:00 2001 From: Sam Simpson Date: Thu, 18 Apr 2024 14:16:32 +0100 Subject: [PATCH 2/2] Output subnet IDs in cluster-infrastructure --- .../deployments/cluster-infrastructure/outputs.tf | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/terraform/deployments/cluster-infrastructure/outputs.tf b/terraform/deployments/cluster-infrastructure/outputs.tf index b208e189b..c9581b5f6 100644 --- a/terraform/deployments/cluster-infrastructure/outputs.tf +++ b/terraform/deployments/cluster-infrastructure/outputs.tf @@ -125,3 +125,15 @@ output "clamav_db_efs_id" { output "public_nat_gateway_ips" { value = [for eip in aws_eip.eks_nat : eip.public_ip] } + +output "private_subnets" { + value = [for sn in aws_subnet.eks_private : sn.id] +} + +output "public_subnets" { + value = [for sn in aws_subnet.eks_public : sn.id] +} + +output "control_plane_subnets" { + value = [for sn in aws_subnet.eks_control_plane : sn.id] +}