expose all vars from comet_ec2 into root

Author: burmek

comet-infrastructure/main.tf

@@ -42,27 +42,32 @@ 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
+  vpc_id           = module.vpc.vpc_id
   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
+  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" {

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" {

comet-infrastructure/variables.tf

@@ -1,9 +1,16 @@
+#global
 variable "environment" {
   description = "Deployment environment, i.e. dev/stage/prod, etc"
   type        = string
   default     = "dev"
 }
 
+variable "region" {
+  description = "AWS region to provision resources in"
+  type        = string
+}
+
+#child module toggles
 variable "enable_ec2" {
   description = "Toggles the EC2 module, to provision EC2 resources for running Comet"
   type        = bool
@@ -34,9 +41,11 @@ variable "enable_s3" {
   type        = bool
 }
 
-variable "region" {
-  description = "AWS region to provision resources in"
+#comet_ec2
+variable "comet_ec2_subnet" {
+  description = "ID of VPC subnet to launch EC2 instance in"
   type        = string
+  default     = null
 }
 
 variable "comet_ec2_ami" {
@@ -45,21 +54,48 @@ variable "comet_ec2_ami" {
   default     = "ami-05842f1afbf311a43"
 }
 
-variable "s3_bucket_name" {
-  description = "Name for S3 bucket"
+variable "comet_ec2_instance_type" {
+  description = "Instance type for the EC2 instance"
   type        = string
-  default     = ""
+  default     = "m5.4xlarge"
 }
 
-variable "rds_root_password" {
-  description = "Root password for RDS database"
+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_key" {
+  description = "Name of the SSH key to configure on the EC2 instance"
   type        = string
+  default     = null
 }
 
+#comet_ec2_alb
+variable "ssl_certificate_arn" {
+  description = "ARN of the ACM certificate to use for the ALB"
+  type        = string
+  default     = ""
+}
+
+#comet_eks
 variable "eks_cluster_name" {
   description = "Name for EKS cluster"
   type        = string
-  default     = "cometeks"
+  default     = "comet-eks"
 }
 
 variable "eks_cluster_version" {
@@ -68,8 +104,14 @@ variable "eks_cluster_version" {
   default     = "1.26"
 }
 
-variable "ssl_certificate_arn" {
-  description = "ARN of the ACM certificate to use for the ALB"
+# comet_rds
+variable "rds_root_password" {
+  description = "Root password for RDS database"
+  type        = string
+}
+
+variable "s3_bucket_name" {
+  description = "Name for S3 bucket"
   type        = string
   default     = ""
 }