eks module updated

vgisme · vgisme · commit 5f833c1b8d00 · 2023-04-13T21:20:51.000+05:30
diff --git a/eks_module/config/terraform.tfvars b/eks_module/config/terraform.tfvars
@@ -0,0 +1,27 @@
+
+aws_eks_cluster_config = {
+
+      "demo-cluster" = {
+
+        eks_cluster_name         = "demo-cluster1"
+        eks_subnet_ids = ["subnet-0c6265a3df91b7b61","subnet-0f9c4ff10c3526a4d","subnet-04919de8d00a175f3","subnet-080af72a4f9415d55"]
+        tags = {
+             "Name" =  "demo-cluster"
+         }  
+      }
+}
+
+eks_node_group_config = {
+
+  "node1" = {
+
+        eks_cluster_name         = "demo-cluster"
+        node_group_name          = "mynode"
+        nodes_iam_role           = "eks-node-group-general1"
+        node_subnet_ids          = [subnet-0c6265a3df91b7b61","subnet-0f9c4ff10c3526a4d","subnet-04919de8d00a175f3","subnet-080af72a4f9415d55"]
+
+        tags = {
+             "Name" =  "node1"
+         } 
+  }
+}
diff --git a/eks_module/main.tf b/eks_module/main.tf
@@ -0,0 +1,26 @@
+
+module "aws_eks_cluster" {
+
+   source = "./modules/aws_eks"
+  
+   for_each = var.aws_eks_cluster_config
+
+    eks_cluster_name              = each.value.eks_cluster_name 
+    subnet_ids                    = each.value.eks_subnet_ids
+    tags                          = each.value.tags
+}
+
+module "aws_eks_node_group" {
+
+   source = "./modules/aws_eks_nodegroup"
+  
+   for_each = var.eks_node_group_config
+
+    node_group_name               = each.value.node_group_name
+    eks_cluster_name              = module.aws_eks_cluster[each.value.eks_cluster_name].eks_cluster_name
+    subnet_ids                    = each.value.node_subnet_ids
+    nodes_iam_role                = each.value.nodes_iam_role
+    tags                          = each.value.tags
+}
+
+
diff --git a/eks_module/modules/aws_eks/main.tf b/eks_module/modules/aws_eks/main.tf
@@ -18,17 +18,21 @@ resource "aws_eks_cluster" "eks" {
     endpoint_public_access = true
 
     # Must be in at least two different availability zones
-       subnet_ids = ["subnet-0c6265a3df91b7b61","subnet-0f9c4ff10c3526a4d","subnet-04919de8d00a175f3","subnet-080af72a4f9415d55"]
+    subnet_ids = var.subnet_ids
+    #   subnet_ids = [
+    #   aws_subnet.public_1.id,
+    #   aws_subnet.public_2.id,
+    #   aws_subnet.private_1.id,
+    #   aws_subnet.private_2.id
+    # ]
   }
 
   # Ensure that IAM Role permissions are created before and deleted after EKS Cluster handling.
   # Otherwise, EKS will not be able to properly delete EKS managed EC2 infrastructure such as Security Groups.
   depends_on = [
     aws_iam_role_policy_attachment.amazon_eks_cluster_policy
   ]
-    tags = {
-        "Name" =  "demo-cluster"
-    }
+  tags = var.tags
 }
 
 resource "aws_iam_role" "eks_cluster" {
@@ -66,12 +70,3 @@ resource "aws_iam_role_policy_attachment" "AmazonEC2ContainerRegistryReadOnly-EK
  policy_arn = "arn:aws:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly"
  role    = aws_iam_role.eks_cluster.name
 }
-
-
-output "eks_cluster_name" {
-    value = aws_eks_cluster.eks.name
-}
-
-variable "eks_cluster_name" {
-     default  =  "demo-cluster1"
-}
diff --git a/eks_module/modules/aws_eks/output.tf b/eks_module/modules/aws_eks/output.tf
@@ -0,0 +1,3 @@
+output "eks_cluster_name" {
+    value = aws_eks_cluster.eks.name
+}
diff --git a/eks_module/modules/aws_eks/variables.tf b/eks_module/modules/aws_eks/variables.tf
@@ -0,0 +1,14 @@
+variable "eks_cluster_name" {
+     default  =  "demo-eks"
+}
+
+variable "subnet_ids" {
+     
+}
+variable "tags" {
+  
+}
+
+# variable "testsubnet_ids" {
+  
+# }
diff --git a/eks_module/modules/aws_eks_nodegroup/main.tf b/eks_module/modules/aws_eks_nodegroup/main.tf
@@ -1,20 +1,8 @@
 
-variable "eks_cluster_name" {
-  
-}
-variable "node_group_name" {
-  default = ""mynode""
-}
-
-variable "nodes_iam_role" {
-  default = "eks-node-group-general1"
-}
-
-
 
 resource "aws_eks_node_group" "nodes_general" {
   # Name of the EKS Cluster.
-  cluster_name = aws_eks_cluster.eks.name
+  cluster_name = var.eks_cluster_name
 
   # Name of the EKS Node Group.
   node_group_name = var.node_group_name
@@ -25,7 +13,7 @@ resource "aws_eks_node_group" "nodes_general" {
   # Identifiers of EC2 Subnets to associate with the EKS Node Group. 
   # These subnets must have the following resource tag: kubernetes.io/cluster/CLUSTER_NAME 
   # (where CLUSTER_NAME is replaced with the name of the EKS Cluster).
-  subnet_ids = [subnet-0c6265a3df91b7b61","subnet-0f9c4ff10c3526a4d","subnet-04919de8d00a175f3","subnet-080af72a4f9415d55"]
+  subnet_ids = var.subnet_ids
 
   # Configuration block with scaling settings
   scaling_config {
@@ -66,9 +54,7 @@ resource "aws_eks_node_group" "nodes_general" {
     aws_iam_role_policy_attachment.amazon_eks_cni_policy_general,
     aws_iam_role_policy_attachment.amazon_ec2_container_registry_read_only,
   ]
-  tags = {
-             "Name" =  "node1"
-         } 
+  tags =  var.tags
 }
 
 # Create IAM role for EKS Node Group
diff --git a/eks_module/modules/aws_eks_nodegroup/variables.tf b/eks_module/modules/aws_eks_nodegroup/variables.tf
@@ -0,0 +1,17 @@
+variable "eks_cluster_name" {
+  
+}
+variable "node_group_name" {
+  default = "nodes-general"
+}
+
+variable "subnet_ids" {
+  
+}
+
+variable "tags" {
+  
+}
+variable "nodes_iam_role" {
+  default = "eks-node-group-general"
+}
diff --git a/eks_module/variables.tf b/eks_module/variables.tf
@@ -0,0 +1,42 @@
+
+variable "access_key" {
+    default = ""
+}
+variable "secret_key" {
+    default = ""
+}
+
+
+variable "region" {
+    default = "us-east-1"
+}
+
+variable "aws_eks_cluster_config" {
+  
+}
+variable "eks_node_group_config" {
+  
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+output "eks_cluster_name" {`
	`2`	`+ value = aws_eks_cluster.eks.name`
	`3`	`+}`