Add ALB module

Author: burmek

comet-infrastructure/.terraform.lock.hcl

@@ -0,0 +1 @@
+Subproject commit 286b327c8a71d74f490080c9d0a6dbfcdb2db0b8

comet-infrastructure/.terraform/modules/comet_ec2_alb.alb

@@ -1 +1 @@
-{"Modules":[{"Key":"","Source":"","Dir":"."},{"Key":"comet_ec2","Source":"./modules/comet_ec2","Dir":"modules/comet_ec2"},{"Key":"comet_eks","Source":"./modules/comet_eks","Dir":"modules/comet_eks"},{"Key":"comet_eks.eks","Source":"registry.terraform.io/terraform-aws-modules/eks/aws","Version":"19.15.2","Dir":".terraform/modules/comet_eks.eks"},{"Key":"comet_eks.eks.eks_managed_node_group","Source":"./modules/eks-managed-node-group","Dir":".terraform/modules/comet_eks.eks/modules/eks-managed-node-group"},{"Key":"comet_eks.eks.eks_managed_node_group.user_data","Source":"../_user_data","Dir":".terraform/modules/comet_eks.eks/modules/_user_data"},{"Key":"comet_eks.eks.fargate_profile","Source":"./modules/fargate-profile","Dir":".terraform/modules/comet_eks.eks/modules/fargate-profile"},{"Key":"comet_eks.eks.kms","Source":"registry.terraform.io/terraform-aws-modules/kms/aws","Version":"1.1.0","Dir":".terraform/modules/comet_eks.eks.kms"},{"Key":"comet_eks.eks.self_managed_node_group","Source":"./modules/self-managed-node-group","Dir":".terraform/modules/comet_eks.eks/modules/self-managed-node-group"},{"Key":"comet_eks.eks.self_managed_node_group.user_data","Source":"../_user_data","Dir":".terraform/modules/comet_eks.eks/modules/_user_data"},{"Key":"comet_eks.eks_blueprints_addons","Source":"registry.terraform.io/aws-ia/eks-blueprints-addons/aws","Version":"0.2.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons"},{"Key":"comet_eks.eks_blueprints_addons.argo_rollouts","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.argo_rollouts"},{"Key":"comet_eks.eks_blueprints_addons.argo_workflows","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.argo_workflows"},{"Key":"comet_eks.eks_blueprints_addons.argocd","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.argocd"},{"Key":"comet_eks.eks_blueprints_addons.aws_cloudwatch_metrics","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.aws_cloudwatch_metrics"},{"Key":"comet_eks.eks_blueprints_addons.aws_efs_csi_driver","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.aws_efs_csi_driver"},{"Key":"comet_eks.eks_blueprints_addons.aws_for_fluentbit","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.aws_for_fluentbit"},{"Key":"comet_eks.eks_blueprints_addons.aws_fsx_csi_driver","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.aws_fsx_csi_driver"},{"Key":"comet_eks.eks_blueprints_addons.aws_load_balancer_controller","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.aws_load_balancer_controller"},{"Key":"comet_eks.eks_blueprints_addons.aws_node_termination_handler","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.aws_node_termination_handler"},{"Key":"comet_eks.eks_blueprints_addons.aws_node_termination_handler_sqs","Source":"registry.terraform.io/terraform-aws-modules/sqs/aws","Version":"4.0.1","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.aws_node_termination_handler_sqs"},{"Key":"comet_eks.eks_blueprints_addons.aws_privateca_issuer","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.aws_privateca_issuer"},{"Key":"comet_eks.eks_blueprints_addons.cert_manager","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.cert_manager"},{"Key":"comet_eks.eks_blueprints_addons.cluster_autoscaler","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.cluster_autoscaler"},{"Key":"comet_eks.eks_blueprints_addons.cluster_proportional_autoscaler","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.cluster_proportional_autoscaler"},{"Key":"comet_eks.eks_blueprints_addons.external_dns","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.external_dns"},{"Key":"comet_eks.eks_blueprints_addons.external_secrets","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.external_secrets"},{"Key":"comet_eks.eks_blueprints_addons.gatekeeper","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.gatekeeper"},{"Key":"comet_eks.eks_blueprints_addons.ingress_nginx","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.ingress_nginx"},{"Key":"comet_eks.eks_blueprints_addons.karpenter","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.karpenter"},{"Key":"comet_eks.eks_blueprints_addons.karpenter_sqs","Source":"registry.terraform.io/terraform-aws-modules/sqs/aws","Version":"4.0.1","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.karpenter_sqs"},{"Key":"comet_eks.eks_blueprints_addons.kube_prometheus_stack","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.kube_prometheus_stack"},{"Key":"comet_eks.eks_blueprints_addons.metrics_server","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.metrics_server"},{"Key":"comet_eks.eks_blueprints_addons.secrets_store_csi_driver","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.secrets_store_csi_driver"},{"Key":"comet_eks.eks_blueprints_addons.secrets_store_csi_driver_provider_aws","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.secrets_store_csi_driver_provider_aws"},{"Key":"comet_eks.eks_blueprints_addons.velero","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.velero"},{"Key":"comet_eks.eks_blueprints_addons.vpa","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.vpa"},{"Key":"comet_eks.irsa-ebs-csi","Source":"registry.terraform.io/terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc","Version":"4.7.0","Dir":".terraform/modules/comet_eks.irsa-ebs-csi/modules/iam-assumable-role-with-oidc"},{"Key":"comet_elasticache","Source":"./modules/comet_elasticache","Dir":"modules/comet_elasticache"},{"Key":"comet_rds","Source":"./modules/comet_rds","Dir":"modules/comet_rds"},{"Key":"comet_s3","Source":"./modules/comet_s3","Dir":"modules/comet_s3"},{"Key":"vpc","Source":"registry.terraform.io/terraform-aws-modules/vpc/aws","Version":"5.0.0","Dir":".terraform/modules/vpc"}]}
+{"Modules":[{"Key":"","Source":"","Dir":"."},{"Key":"comet_ec2","Source":"./modules/comet_ec2","Dir":"modules/comet_ec2"},{"Key":"comet_ec2_alb","Source":"./modules/comet_ec2_alb","Dir":"modules/comet_ec2_alb"},{"Key":"comet_ec2_alb.alb","Source":"registry.terraform.io/terraform-aws-modules/alb/aws","Version":"8.6.1","Dir":".terraform/modules/comet_ec2_alb.alb"},{"Key":"comet_eks","Source":"./modules/comet_eks","Dir":"modules/comet_eks"},{"Key":"comet_eks.eks","Source":"registry.terraform.io/terraform-aws-modules/eks/aws","Version":"19.15.2","Dir":".terraform/modules/comet_eks.eks"},{"Key":"comet_eks.eks.eks_managed_node_group","Source":"./modules/eks-managed-node-group","Dir":".terraform/modules/comet_eks.eks/modules/eks-managed-node-group"},{"Key":"comet_eks.eks.eks_managed_node_group.user_data","Source":"../_user_data","Dir":".terraform/modules/comet_eks.eks/modules/_user_data"},{"Key":"comet_eks.eks.fargate_profile","Source":"./modules/fargate-profile","Dir":".terraform/modules/comet_eks.eks/modules/fargate-profile"},{"Key":"comet_eks.eks.kms","Source":"registry.terraform.io/terraform-aws-modules/kms/aws","Version":"1.1.0","Dir":".terraform/modules/comet_eks.eks.kms"},{"Key":"comet_eks.eks.self_managed_node_group","Source":"./modules/self-managed-node-group","Dir":".terraform/modules/comet_eks.eks/modules/self-managed-node-group"},{"Key":"comet_eks.eks.self_managed_node_group.user_data","Source":"../_user_data","Dir":".terraform/modules/comet_eks.eks/modules/_user_data"},{"Key":"comet_eks.eks_blueprints_addons","Source":"registry.terraform.io/aws-ia/eks-blueprints-addons/aws","Version":"0.2.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons"},{"Key":"comet_eks.eks_blueprints_addons.argo_rollouts","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.argo_rollouts"},{"Key":"comet_eks.eks_blueprints_addons.argo_workflows","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.argo_workflows"},{"Key":"comet_eks.eks_blueprints_addons.argocd","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.argocd"},{"Key":"comet_eks.eks_blueprints_addons.aws_cloudwatch_metrics","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.aws_cloudwatch_metrics"},{"Key":"comet_eks.eks_blueprints_addons.aws_efs_csi_driver","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.aws_efs_csi_driver"},{"Key":"comet_eks.eks_blueprints_addons.aws_for_fluentbit","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.aws_for_fluentbit"},{"Key":"comet_eks.eks_blueprints_addons.aws_fsx_csi_driver","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.aws_fsx_csi_driver"},{"Key":"comet_eks.eks_blueprints_addons.aws_load_balancer_controller","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.aws_load_balancer_controller"},{"Key":"comet_eks.eks_blueprints_addons.aws_node_termination_handler","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.aws_node_termination_handler"},{"Key":"comet_eks.eks_blueprints_addons.aws_node_termination_handler_sqs","Source":"registry.terraform.io/terraform-aws-modules/sqs/aws","Version":"4.0.1","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.aws_node_termination_handler_sqs"},{"Key":"comet_eks.eks_blueprints_addons.aws_privateca_issuer","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.aws_privateca_issuer"},{"Key":"comet_eks.eks_blueprints_addons.cert_manager","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.cert_manager"},{"Key":"comet_eks.eks_blueprints_addons.cluster_autoscaler","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.cluster_autoscaler"},{"Key":"comet_eks.eks_blueprints_addons.cluster_proportional_autoscaler","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.cluster_proportional_autoscaler"},{"Key":"comet_eks.eks_blueprints_addons.external_dns","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.external_dns"},{"Key":"comet_eks.eks_blueprints_addons.external_secrets","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.external_secrets"},{"Key":"comet_eks.eks_blueprints_addons.gatekeeper","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.gatekeeper"},{"Key":"comet_eks.eks_blueprints_addons.ingress_nginx","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.ingress_nginx"},{"Key":"comet_eks.eks_blueprints_addons.karpenter","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.karpenter"},{"Key":"comet_eks.eks_blueprints_addons.karpenter_sqs","Source":"registry.terraform.io/terraform-aws-modules/sqs/aws","Version":"4.0.1","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.karpenter_sqs"},{"Key":"comet_eks.eks_blueprints_addons.kube_prometheus_stack","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.kube_prometheus_stack"},{"Key":"comet_eks.eks_blueprints_addons.metrics_server","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.metrics_server"},{"Key":"comet_eks.eks_blueprints_addons.secrets_store_csi_driver","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.secrets_store_csi_driver"},{"Key":"comet_eks.eks_blueprints_addons.secrets_store_csi_driver_provider_aws","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.secrets_store_csi_driver_provider_aws"},{"Key":"comet_eks.eks_blueprints_addons.velero","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.velero"},{"Key":"comet_eks.eks_blueprints_addons.vpa","Source":"registry.terraform.io/aws-ia/eks-blueprints-addon/aws","Version":"1.0.0","Dir":".terraform/modules/comet_eks.eks_blueprints_addons.vpa"},{"Key":"comet_eks.irsa-ebs-csi","Source":"registry.terraform.io/terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc","Version":"4.7.0","Dir":".terraform/modules/comet_eks.irsa-ebs-csi/modules/iam-assumable-role-with-oidc"},{"Key":"comet_elasticache","Source":"./modules/comet_elasticache","Dir":"modules/comet_elasticache"},{"Key":"comet_rds","Source":"./modules/comet_rds","Dir":"modules/comet_rds"},{"Key":"comet_s3","Source":"./modules/comet_s3","Dir":"modules/comet_s3"},{"Key":"vpc","Source":"registry.terraform.io/terraform-aws-modules/vpc/aws","Version":"5.0.0","Dir":".terraform/modules/vpc"}]}

comet-infrastructure/.terraform/modules/modules.json

@@ -13,7 +13,7 @@ locals {
   #set environment here, and use local.environment for the environment variables in all of the module calls
 
   tags = {
-    Terraform_Managed = "true"
+    Terraform = "true"
     Environment       = var.environment
   }
 }
@@ -51,20 +51,36 @@ module "vpc" {
 module "comet_ec2" {
   source = "./modules/comet_ec2"
   count  = var.enable_ec2 ? 1 : 0
+
+  environment = var.environment
 
   vpc_id = module.vpc.vpc_id
-  comet_ec2_ami = "ami-05842f1afbf311a43"
+  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
 }
 
+module "comet_ec2_alb" {
+  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
+
+  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
 
+  environment = var.environment
+
   vpc_id = module.vpc.vpc_id
   vpc_private_subnets = module.vpc.private_subnets
   cluster_name = var.eks_cluster_name
@@ -78,6 +94,8 @@ module "comet_elasticache" {
   source = "./modules/comet_elasticache"
   count  = var.enable_elasticache ? 1 : 0
 
+  environment = var.environment
+
   ec2_enabled = var.enable_ec2
   eks_enabled = var.enable_eks
 
@@ -93,6 +111,8 @@ module "comet_rds" {
   source = "./modules/comet_rds"
   count  = var.enable_rds ? 1 : 0
 
+  environment = var.environment
+
   ec2_enabled = var.enable_ec2
   eks_enabled = var.enable_eks
 
@@ -103,12 +123,15 @@ module "comet_rds" {
   # 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
 }
 
 module "comet_s3" {
   source = "./modules/comet_s3"
   count  = var.enable_s3 ? 1 : 0
 
+  environment = var.environment
+
   comet_s3_bucket  = var.s3_bucket_name
 }