expose all vars from comet_eks into root

Author: burmek

comet-infrastructure/main.tf

@@ -83,17 +83,25 @@ module "comet_ec2_alb" {
 }
 
 module "comet_eks" {
-  source = "./modules/comet_eks"
-  count  = var.enable_eks ? 1 : 0
-
+  source      = "./modules/comet_eks"
+  count       = var.enable_eks ? 1 : 0
   environment = var.environment
 
-  vpc_id = module.vpc.vpc_id
-  vpc_private_subnets = module.vpc.private_subnets
-  cluster_name = var.eks_cluster_name
-  cluster_version = var.eks_cluster_version
+  vpc_id                           = module.vpc.vpc_id
+  eks_private_subnets              = module.vpc.private_subnets
+  eks_cluster_name                 = var.eks_cluster_name
+  eks_cluster_version              = var.eks_cluster_version
+  eks_mng_name                     = var.eks_mng_name
+  eks_mng_ami_type                 = var.eks_mng_ami_type
+  eks_node_types                   = var.eks_node_types
+  eks_mng_desired_size             = var.eks_mng_desired_size
+  eks_mng_max_size                 = var.eks_mng_max_size
+  eks_aws_load_balancer_controller = var.eks_aws_load_balancer_controller
+  eks_cert_manager                 = var.eks_cert_manager
+  eks_aws_cloudwatch_metrics       = var.eks_aws_cloudwatch_metrics
+  eks_external_dns                 = var.eks_external_dns
 
-  s3_enabled = var.enable_s3
+  s3_enabled              = var.enable_s3
   comet_ec2_s3_iam_policy = var.enable_s3 ? module.comet_s3[0].comet_s3_iam_policy_arn : null
 }
 

comet-infrastructure/modules/comet_eks/main.tf

@@ -1,7 +1,7 @@
 locals {
   tags = {
-    Terraform         =  "true"
-    Environment       = var.environment
+    Terraform   =  "true"
+    Environment = var.environment
   }
 }
 
@@ -13,28 +13,22 @@ module "eks" {
   source  = "terraform-aws-modules/eks/aws"
   version = "~> 19.9"
 
-  cluster_name                   = var.cluster_name
-  cluster_version                = var.cluster_version
+  cluster_name                   = var.eks_cluster_name
+  cluster_version                = var.eks_cluster_version
   cluster_endpoint_public_access = true
 
   vpc_id     = var.vpc_id
-  subnet_ids = var.vpc_private_subnets
+  subnet_ids = var.eks_private_subnets
 
-  #manage_aws_auth_configmap = true
-
-  eks_managed_node_group_defaults = {
-    ami_type = "AL2_x86_64"
-  }
+  eks_managed_node_group_defaults = {ami_type = var.eks_mng_ami_type}
 
   eks_managed_node_groups = {
     one = {
-      name = "mng"
-
-      instance_types = ["m5.4xlarge"]
-
-      min_size     = 3
-      max_size     = 6
-      desired_size = 3
+      name           = var.eks_mng_name
+      instance_types = var.eks_node_types
+      min_size       = var.eks_mng_desired_size
+      max_size       = var.eks_mng_max_size
+      desired_size   = var.eks_mng_desired_size
 
       iam_role_additional_policies = var.s3_enabled ? {comet_s3_access = var.comet_ec2_s3_iam_policy} : {}
     }
@@ -67,15 +61,13 @@ module "eks_blueprints_addons" {
     coredns            = {}
     vpc-cni            = {}
     kube-proxy         = {}
-    aws-ebs-csi-driver = {
-      service_account_role_arn = module.irsa-ebs-csi.iam_role_arn
-    }
+    aws-ebs-csi-driver = {service_account_role_arn = module.irsa-ebs-csi.iam_role_arn}
   }
 
-  enable_aws_load_balancer_controller = true
-  enable_cert_manager = true
-  enable_aws_cloudwatch_metrics = true
-  enable_external_dns = true
+  enable_aws_load_balancer_controller = var.eks_aws_load_balancer_controller
+  enable_cert_manager                 = var.eks_cert_manager
+  enable_aws_cloudwatch_metrics       = var.eks_aws_cloudwatch_metrics
+  enable_external_dns                 = var.eks_external_dns
 
   tags = local.tags
 }

comet-infrastructure/modules/comet_eks/variables.tf

@@ -4,25 +4,69 @@ variable "environment" {
   default     = "dev"
 }
 
-variable "cluster_name" {
+variable "vpc_id" {
+  description = "ID of the VPC that the EKS cluster will be launched in"
+  type        = string
+}
+
+variable "eks_private_subnets" {
+  description = "IDs of private subnets within the VPC"
+  type        = list(string)
+}
+
+variable "eks_cluster_name" {
   description = "Name for the EKS cluster"
   type        = string
 }
 
-variable "cluster_version" {
+variable "eks_cluster_version" {
   description = "Kubernetes version for the EKS cluster"
   type        = string
 }
 
-variable "vpc_id" {
-  description = "ID of the VPC that the EKS cluster will be launched in"
+variable "eks_mng_name" {
+  description = "Name for the EKS managed nodegroup"
   type        = string
 }
 
-variable "vpc_private_subnets" {
-  description = "IDs of private subnets within the VPC"
+variable "eks_mng_ami_type" {
+  description = "AMI family to use for the EKS nodes"
+  type        = string
+}
+
+variable "eks_node_types" {
+  description = "Node instance types for EKS managed node group"
   type        = list(string)
-  default     = []
+}
+
+variable "eks_mng_desired_size" {
+  description = "Desired number of nodes in EKS cluster"
+  type        = number
+}
+
+variable "eks_mng_max_size" {
+  description = "Maximum number of nodes in EKS cluster"
+  type        = number
+}
+
+variable "eks_aws_load_balancer_controller" {
+  description = "Enables the AWS Load Balancer Controller in the EKS cluster"
+  type        = bool
+}
+
+variable "eks_cert_manager" {
+  description = "Enables cert-manager in the EKS cluster"
+  type        = bool
+}
+
+variable "eks_aws_cloudwatch_metrics" {
+  description = "Enables AWS Cloudwatch Metrics in the EKS cluster"
+  type        = bool
+}
+
+variable "eks_external_dns" {
+  description = "Enables ExternalDNS in the EKS cluster"
+  type        = bool
 }
 
 variable "s3_enabled" {

comet-infrastructure/variables.tf

@@ -92,6 +92,12 @@ variable "ssl_certificate_arn" {
 }
 
 #comet_eks
+variable "eks_private_subnets" {
+  description = "IDs of private subnets within the VPC"
+  type        = list(string)
+  default     = null
+}
+
 variable "eks_cluster_name" {
   description = "Name for EKS cluster"
   type        = string
@@ -104,7 +110,61 @@ variable "eks_cluster_version" {
   default     = "1.26"
 }
 
-# comet_rds
+variable "eks_mng_name" {
+  description = "Name for the EKS managed nodegroup"
+  type        = string
+  default     = "mng"
+}
+
+variable "eks_mng_ami_type" {
+  description = "AMI family to use for the EKS nodes"
+  type        = string
+  default     = "AL2_x86_64"
+}
+
+variable "eks_node_types" {
+  description = "Node instance types for EKS managed node group"
+  type        = list(string)
+  default     = ["m5.4xlarge"]
+}
+
+variable "eks_mng_desired_size" {
+  description = "Desired number of nodes in EKS cluster"
+  type        = number
+  default     = 3
+}
+
+variable "eks_mng_max_size" {
+  description = "Maximum number of nodes in EKS cluster"
+  type        = number
+  default     = 6
+}
+
+variable "eks_aws_load_balancer_controller" {
+  description = "Enables the AWS Load Balancer Controller in the EKS cluster"
+  type        = bool
+  default     = true
+}
+
+variable "eks_cert_manager" {
+  description = "Enables cert-manager in the EKS cluster"
+  type        = bool
+  default     = true
+}
+
+variable "eks_aws_cloudwatch_metrics" {
+  description = "Enables AWS Cloudwatch Metrics in the EKS cluster"
+  type        = bool
+  default     = true
+}
+
+variable "eks_external_dns" {
+  description = "Enables ExternalDNS in the EKS cluster"
+  type        = bool
+  default     = true
+}
+
+#comet_rds
 variable "rds_root_password" {
   description = "Root password for RDS database"
   type        = string