Merge pull request #1 from comet-ml/expose-vars

Expose vars

Author: burmek

comet-infrastructure/main.tf

@@ -42,97 +42,113 @@ module "vpc" {
   default_security_group_tags   = { Name = "${local.resource_name}-default" }
 
   # if EKS deployment, set subnet tags for AWS Load Balancer Controller auto-discovery
-  public_subnet_tags = var.enable_eks ? {"kubernetes.io/role/elb" = 1} : null
+  public_subnet_tags  = var.enable_eks ? {"kubernetes.io/role/elb" = 1} : null
   private_subnet_tags = var.enable_eks ? {"kubernetes.io/role/internal-elb" = 1} : null
 
   tags = local.tags
 }
 
 module "comet_ec2" {
-  source = "./modules/comet_ec2"
-  count  = var.enable_ec2 ? 1 : 0
-
+  source      = "./modules/comet_ec2"
+  count       = var.enable_ec2 ? 1 : 0
   environment = var.environment
 
-  vpc_id = module.vpc.vpc_id
-  comet_ec2_ami = var.comet_ec2_ami
-  comet_ec2_subnet = module.vpc.public_subnets[count.index % length(module.vpc.public_subnets)]
-
-  s3_enabled = var.enable_s3
-  comet_ml_s3_bucket  = var.s3_bucket_name
-  comet_ec2_s3_iam_policy = var.enable_s3 ? module.comet_s3[0].comet_s3_iam_policy_arn : null
+  vpc_id                   = module.vpc.vpc_id
+  comet_ec2_subnet         = module.vpc.public_subnets[count.index % length(module.vpc.public_subnets)]
+  comet_ec2_ami            = var.comet_ec2_ami
+  comet_ec2_instance_type  = var.comet_ec2_instance_type
+  comet_ec2_instance_count = var.comet_ec2_instance_count
+  comet_ec2_volume_type    = var.comet_ec2_volume_type
+  comet_ec2_volume_size    = var.comet_ec2_volume_size
+  comet_ec2_key            = var.comet_ec2_key
 
   alb_enabled = var.enable_ec2_alb
+
+  s3_enabled              = var.enable_s3
+  comet_ml_s3_bucket      = var.s3_bucket_name
+  comet_ec2_s3_iam_policy = var.enable_s3 ? module.comet_s3[0].comet_s3_iam_policy_arn : null
 }
 
 module "comet_ec2_alb" {
-  source = "./modules/comet_ec2_alb"
-  count  = var.enable_ec2_alb ? 1 : 0
-
+  source      = "./modules/comet_ec2_alb"
+  count       = var.enable_ec2_alb ? 1 : 0
   environment = var.environment
 
-  vpc_id = module.vpc.vpc_id
-  public_subnets = module.vpc.public_subnets
-
+  vpc_id              = module.vpc.vpc_id
+  public_subnets      = module.vpc.public_subnets
   ssl_certificate_arn = var.enable_ec2_alb ? var.ssl_certificate_arn : null
 }
 
 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
-
-  s3_enabled = var.enable_s3
+  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
   comet_ec2_s3_iam_policy = var.enable_s3 ? module.comet_s3[0].comet_s3_iam_policy_arn : null
 }
 
 module "comet_elasticache" {
-  source = "./modules/comet_elasticache"
-  count  = var.enable_elasticache ? 1 : 0
-
+  source      = "./modules/comet_elasticache"
+  count       = var.enable_elasticache ? 1 : 0
   environment = var.environment
 
   ec2_enabled = var.enable_ec2
   eks_enabled = var.enable_eks
 
-  vpc_id              = module.vpc.vpc_id
-  vpc_private_subnets = module.vpc.private_subnets
-
-  # index is used on the module refs becuase of the count usage in the toggle: "After the count apply the resource becomes a group, so later in the reference use 0-index of the group"
-  elasticache_allow_ec2_sg = var.enable_ec2 ? module.comet_ec2[0].comet_ec2_sg_id : null
-  elasticache_allow_eks_sg = var.enable_eks ? module.comet_eks[0].nodegroup_sg_id : null
+  vpc_id                       = module.vpc.vpc_id
+  elasticache_private_subnets  = module.vpc.private_subnets
+  elasticache_allow_ec2_sg     = var.enable_ec2 ? module.comet_ec2[0].comet_ec2_sg_id : null
+  elasticache_allow_eks_sg     = var.enable_eks ? module.comet_eks[0].nodegroup_sg_id : null
+  elasticache_engine           = var.elasticache_engine
+  elasticache_engine_version   = var.elasticache_engine_version
+  elasticache_instance_type    = var.elasticache_instance_type
+  elasticache_param_group_name = var.elasticache_param_group_name
+  elasticache_num_cache_nodes  = var.elasticache_num_cache_nodes
 }
 
 module "comet_rds" {
-  source = "./modules/comet_rds"
-  count  = var.enable_rds ? 1 : 0
-
+  source      = "./modules/comet_rds"
+  count       = var.enable_rds ? 1 : 0
   environment = var.environment
 
   ec2_enabled = var.enable_ec2
   eks_enabled = var.enable_eks
 
-  availability_zones = local.azs
-  vpc_id              = module.vpc.vpc_id
-  vpc_private_subnets = module.vpc.private_subnets
-
-  # index is used on the module refs becuase of the count usage in the toggle: "After the count apply the resource becomes a group, so later in the reference use 0-index of the group"
-  rds_allow_ec2_sg = var.enable_ec2 ? module.comet_ec2[0].comet_ec2_sg_id : null
-  rds_allow_eks_sg = var.enable_eks ? module.comet_eks[0].nodegroup_sg_id : null
-
-  rds_root_password = var.rds_root_password
+  availability_zones          = local.azs
+  vpc_id                      = module.vpc.vpc_id
+  rds_private_subnets         = module.vpc.private_subnets
+  rds_allow_ec2_sg            = var.enable_ec2 ? module.comet_ec2[0].comet_ec2_sg_id : null
+  rds_allow_eks_sg            = var.enable_eks ? module.comet_eks[0].nodegroup_sg_id : null
+  rds_engine                  = var.rds_engine
+  rds_engine_version          = var.rds_engine_version
+  rds_instance_type           = var.rds_instance_type
+  rds_instance_count          = var.rds_instance_count
+  rds_storage_encrypted       = var.rds_storage_encrypted
+  rds_iam_db_auth             = var.rds_iam_db_auth
+  rds_backup_retention_period = var.rds_backup_retention_period
+  rds_preferred_backup_window = var.rds_preferred_backup_window
+  rds_database_name           = var.rds_database_name
+  rds_root_password           = var.rds_root_password
 }
 
 module "comet_s3" {
-  source = "./modules/comet_s3"
-  count  = var.enable_s3 ? 1 : 0
-
+  source      = "./modules/comet_s3"
+  count       = var.enable_s3 ? 1 : 0
   environment = var.environment
 
   comet_s3_bucket  = var.s3_bucket_name

comet-infrastructure/modules/comet_ec2/main.tf

@@ -6,18 +6,18 @@ locals {
   cidr_anywhere = "0.0.0.0/0"
 
   tags = {
-    Terraform = "true"
-    Environment       = var.environment
+    Terraform   = "true"
+    Environment = var.environment
   }
 }
 
 resource "aws_instance" "comet_ec2" {
-  ami           = var.comet_ec2_ami
-  instance_type = var.comet_ec2_instance_type
-  key_name      = var.key_name
-  count         = var.comet_ec2_instance_count
-  iam_instance_profile = aws_iam_instance_profile.comet-ec2-instance-profile.name
-  subnet_id     = var.comet_ec2_subnet
+  ami                    = var.comet_ec2_ami
+  instance_type          = var.comet_ec2_instance_type
+  key_name               = var.comet_ec2_key
+  count                  = var.comet_ec2_instance_count
+  iam_instance_profile   = aws_iam_instance_profile.comet-ec2-instance-profile.name
+  subnet_id              = var.comet_ec2_subnet
   vpc_security_group_ids = [aws_security_group.comet_ec2_sg.id]
 
   #associate_public_ip_address = true
@@ -36,9 +36,8 @@ resource "aws_instance" "comet_ec2" {
   }
 }
 
-# need to make this conditional based on ALB usage
 resource "aws_eip" "comet_ec2_eip" {
-  count = var.alb_enabled ? 0 : 1
+  count    = var.alb_enabled ? 0 : 1
   instance = aws_instance.comet_ec2[0].id
   domain   = "vpc"
 }
@@ -52,31 +51,31 @@ resource "aws_security_group" "comet_ec2_sg" {
 resource "aws_vpc_security_group_ingress_rule" "comet_ec2_ingress_ssh" {
   security_group_id = aws_security_group.comet_ec2_sg.id
 
-  from_port   = local.ssh_port
-  to_port     = local.ssh_port
+  from_port      = local.ssh_port
+  to_port        = local.ssh_port
   ip_protocol    = "tcp"
   # make more restrictive
-  cidr_ipv4 = local.cidr_anywhere
+  cidr_ipv4      = local.cidr_anywhere
 }
 
 resource "aws_vpc_security_group_ingress_rule" "comet_ec2_ingress_http" {
   security_group_id = aws_security_group.comet_ec2_sg.id
 
-  from_port   = local.http_port
-  to_port     = local.http_port
+  from_port      = local.http_port
+  to_port        = local.http_port
   ip_protocol    = "tcp"
   # make more restrictive
-  cidr_ipv4 = local.cidr_anywhere
+  cidr_ipv4      = local.cidr_anywhere
 }
 
 resource "aws_vpc_security_group_ingress_rule" "comet_ec2_ingress_https" {
   security_group_id = aws_security_group.comet_ec2_sg.id
 
-  from_port   = local.https_port
-  to_port     = local.https_port
+  from_port      = local.https_port
+  to_port        = local.https_port
   ip_protocol    = "tcp"
   # make more restrictive
-  cidr_ipv4 = local.cidr_anywhere
+  cidr_ipv4      = local.cidr_anywhere
 }
 
 /*
@@ -92,8 +91,8 @@ resource "aws_vpc_security_group_ingress_rule" "comet_ec2_alb_http" {
 
 resource "aws_vpc_security_group_egress_rule" "comet_ec2_egress_any" {
   security_group_id = aws_security_group.comet_ec2_sg.id
-  ip_protocol    = "-1"
-  cidr_ipv4 = local.cidr_anywhere
+  ip_protocol       = "-1"
+  cidr_ipv4         = local.cidr_anywhere
 }
 
 resource "aws_iam_role" "comet-ec2-s3-access-role" {

comet-infrastructure/modules/comet_ec2/variables.tf

@@ -4,64 +4,56 @@ variable "environment" {
   default     = "dev"
 }
 
+variable "alb_enabled" {
+  description = "Indicates if ALB is being provisioned for Comet EC2 instance"
+  type        = bool
+  default     = null
+}
+
+variable "s3_enabled" {
+  description = "Indicates if S3 bucket is being provisioned for Comet"
+  type        = bool
+  default     = null
+}
+
 variable "vpc_id" {
   description = "ID of the VPC that will contain the provisioned resources"
   type        = string
-  #default     = ""
 }
 
 variable "comet_ec2_ami" {
   description = "AMI for the EC2 instance"
   type        = string
-  default     = ""
 }
 
 variable "comet_ec2_instance_type" {
   description = "Instance type for the EC2 instance"
   type        = string
-  default     = "m5.4xlarge"
-}
-
-variable "key_name" {
-  description = "Name of the SSH key to configure on the EC2 instance"
-  type        = string
-  default     = ""
 }
 
 variable "comet_ec2_instance_count" {
   description = "Number of EC2 instances to provision"
   type        = number
-  default     = 1
 }
 
 variable "comet_ec2_volume_type" {
   description = "EBS volume type for the EC2 instance root volume"
   type        = string
-  default     = "gp2"
 }
 
 variable "comet_ec2_volume_size" {
   description = "Size, in gibibytes (GiB), for the EC2 instance root volume"
   type        = number
-  default     = 1024
 }
 
 variable "comet_ec2_subnet" {
   description = "ID of VPC subnet to launch EC2 instance in"
   type        = string
-  default     = ""
-}
-
-variable "s3_enabled" {
-  description = "Indicates if S3 bucket is being provisioned for Comet"
-  type        = bool
-  default     = null
 }
 
-variable "alb_enabled" {
-  description = "Indicates if ALB is being provisioned for Comet EC2 instance"
-  type        = bool
-  default     = null
+variable "comet_ec2_key" {
+  description = "Name of the SSH key to configure on the EC2 instance"
+  type        = string
 }
 
 variable "comet_ml_s3_bucket" {