diff --git a/main.tf b/main.tf index 737cd5e5..a4d77bd3 100644 --- a/main.tf +++ b/main.tf @@ -57,7 +57,7 @@ locals { network_private_subnets = var.create_vpc ? module.networking.private_subnets : var.network_private_subnets network_private_subnet_cidrs = var.create_vpc ? module.networking.private_subnet_cidrs : var.network_private_subnet_cidrs - network_database_subnets = var.create_vpc ? module.networking.database_subnets : var.network_database_subnets + network_database_subnets = var.create_vpc ? module.networking.database_subnets : var.network_database_subnets # tflint-ignore: terraform_unused_declarations network_database_subnet_cidrs = var.create_vpc ? module.networking.database_subnet_cidrs : var.network_database_subnet_cidrs network_database_create_subnet_group = !var.create_vpc diff --git a/modules/app_eks/add-ons.tf b/modules/app_eks/add-ons.tf index 3db67c0f..36bc0142 100644 --- a/modules/app_eks/add-ons.tf +++ b/modules/app_eks/add-ons.tf @@ -32,43 +32,43 @@ resource "aws_iam_role" "oidc" { ### add-ons for eks version 1.28 resource "aws_eks_addon" "aws_efs_csi_driver" { - depends_on = [ - aws_eks_addon.vpc_cni - ] - cluster_name = var.namespace - addon_name = "aws-efs-csi-driver" - addon_version = "v2.0.4-eksbuild.1" - resolve_conflicts = "OVERWRITE" + depends_on = [ + aws_eks_addon.vpc_cni + ] + cluster_name = var.namespace + addon_name = "aws-efs-csi-driver" + addon_version = "v2.0.4-eksbuild.1" + resolve_conflicts = "OVERWRITE" } resource "aws_eks_addon" "aws_ebs_csi_driver" { depends_on = [ aws_eks_addon.vpc_cni ] - cluster_name = var.namespace - addon_name = "aws-ebs-csi-driver" - addon_version = "v1.31.0-eksbuild.1" - resolve_conflicts = "OVERWRITE" + cluster_name = var.namespace + addon_name = "aws-ebs-csi-driver" + addon_version = "v1.31.0-eksbuild.1" + resolve_conflicts = "OVERWRITE" } resource "aws_eks_addon" "coredns" { depends_on = [ aws_eks_addon.vpc_cni ] - cluster_name = var.namespace - addon_name = "coredns" - addon_version = "v1.10.1-eksbuild.11" - resolve_conflicts = "OVERWRITE" + cluster_name = var.namespace + addon_name = "coredns" + addon_version = "v1.10.1-eksbuild.11" + resolve_conflicts = "OVERWRITE" } resource "aws_eks_addon" "kube_proxy" { depends_on = [ aws_eks_addon.vpc_cni ] - cluster_name = var.namespace - addon_name = "kube-proxy" - addon_version = "v1.28.8-eksbuild.5" - resolve_conflicts = "OVERWRITE" + cluster_name = var.namespace + addon_name = "kube-proxy" + addon_version = "v1.28.8-eksbuild.5" + resolve_conflicts = "OVERWRITE" } resource "aws_eks_addon" "vpc_cni" { diff --git a/modules/app_lb/outputs.tf b/modules/app_lb/outputs.tf index 20724c32..6f8fa61f 100644 --- a/modules/app_lb/outputs.tf +++ b/modules/app_lb/outputs.tf @@ -15,9 +15,9 @@ output "tg_app_arn" { } output "alb_name" { -value = aws_lb.alb.arn + value = aws_lb.alb.arn } output "nlb_security_group" { - value = var.enable_private_only_traffic? aws_security_group.inbound_private[0].id : null + value = var.enable_private_only_traffic ? aws_security_group.inbound_private[0].id : null } \ No newline at end of file diff --git a/modules/endpoint/main.tf b/modules/endpoint/main.tf index dc64c71c..2c8ebe6b 100644 --- a/modules/endpoint/main.tf +++ b/modules/endpoint/main.tf @@ -1,9 +1,9 @@ resource "aws_vpc_endpoint" "default" { - vpc_id = var.network_id - service_name = var.service_name - vpc_endpoint_type = "Gateway" - auto_accept = true - route_table_ids = var.private_route_table_id + vpc_id = var.network_id + service_name = var.service_name + vpc_endpoint_type = "Gateway" + auto_accept = true + route_table_ids = var.private_route_table_id policy = <