Refactor EKS module to use specific subnet variables and add dependencies for NAT gateway

Author: karimzakzouk

Terraform/3-main.tf

@@ -9,18 +9,14 @@ module "vpc" {
 }
 
 module "eks" {
-  source = "./modules/eks" 
-
-  cluster_name    = var.cluster_name
+  source = "./modules/eks"
+  cluster_name = var.cluster_name
   cluster_version = var.cluster_version
-  vpc_id          = module.vpc.vpc_id
-  subnet_ids      = module.vpc.private_subnet_ids
-  node_groups     = var.node_groups
-
-
+  vpc_id = module.vpc.vpc_id
+  cluster_subnet_ids = concat(module.vpc.private_subnet_ids, module.vpc.public_subnet_ids)
+  node_subnet_ids = module.vpc.private_subnet_ids
+  node_groups = var.node_groups
 }
-
-# EKS Addon: metrics-server (enables HPA CPU/memory metrics)
 resource "aws_eks_addon" "metrics_server" {
   cluster_name             = module.eks.cluster_name
   depends_on = [module.eks]

Terraform/modules/eks/main.tf

@@ -9,7 +9,7 @@ resource "aws_eks_cluster" "main" {
   }
 
   vpc_config {
-    subnet_ids = var.subnet_ids
+    subnet_ids = var.cluster_subnet_ids  # Changed from var.subnet_ids
   }
 
   depends_on = [
@@ -93,8 +93,7 @@ resource "aws_eks_node_group" "main" {
   cluster_name    = aws_eks_cluster.main.name
   node_group_name = each.key
   node_role_arn   = aws_iam_role.node.arn
-  subnet_ids      = var.subnet_ids
-
+  subnet_ids = var.node_subnet_ids  # Changed from var.subnet_ids
   scaling_config {
     desired_size = each.value.scaling_config.desired_size
     max_size     = each.value.scaling_config.max_size

Terraform/modules/eks/variables.tf

@@ -13,11 +13,15 @@ variable "vpc_id" {
   type        = string
 }
 
-variable "subnet_ids" {
-  description   = "Subnets IDS"
-  type          = list(string)
+variable "cluster_subnet_ids" {
+  description = "List of subnet IDs for EKS cluster (public + private)"
+  type        = list(string)
 }
 
+variable "node_subnet_ids" {
+  description = "List of subnet IDs for EKS node groups (private only)"
+  type        = list(string)
+}
 variable "node_groups" {
   description   = "EKS node groups configuration"
   type          = map(object({

Terraform/modules/vpc/main.tf

@@ -78,6 +78,11 @@ resource "aws_nat_gateway" "main" {
   count             = length(var.public_subnet_cidrs)
   allocation_id     = aws_eip.nat[count.index].id
   subnet_id         = aws_subnet.public[count.index].id
+  depends_on    = [
+    aws_internet_gateway.main,
+    aws_subnet.public,
+    aws_eip.nat
+  ] # Add this line
 
   tags = {
     Name = "${var.cluster_name}-nat-${count.index + 1}"