From d3a9b07ae89c89d46d28adb36b84f67b6adcaa0a Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Tue, 9 Jul 2024 21:04:14 -0400 Subject: [PATCH] add other addons --- .../eks-cert-manager/terragrunt.hcl | 23 +++++++++++++ .../vpc/mcmCluster/eks-config/terragrunt.hcl | 20 ++--------- .../vpc/mcmCluster/eks-istio/terragrunt.hcl | 33 +++++++++++++++++++ .../vpc/mcmCluster/eks-loki/terragrunt.hcl | 32 ++++++++++++++++++ 4 files changed, 90 insertions(+), 18 deletions(-) create mode 100644 lab/us-gov-east-1/vpc/mcmCluster/eks-cert-manager/terragrunt.hcl create mode 100644 lab/us-gov-east-1/vpc/mcmCluster/eks-istio/terragrunt.hcl create mode 100644 lab/us-gov-east-1/vpc/mcmCluster/eks-loki/terragrunt.hcl diff --git a/lab/us-gov-east-1/vpc/mcmCluster/eks-cert-manager/terragrunt.hcl b/lab/us-gov-east-1/vpc/mcmCluster/eks-cert-manager/terragrunt.hcl new file mode 100644 index 0000000..c0c10db --- /dev/null +++ b/lab/us-gov-east-1/vpc/mcmCluster/eks-cert-manager/terragrunt.hcl @@ -0,0 +1,23 @@ +terraform { +# source = "git@github.e.it.census.gov:terraform-modules/aws-certificates//acmpca-eks-cert-manager" + # source = "./cert-mgr.tf" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git" + +# cluster_name = var.cluster_name +# contact_email = var.cluster_mailing_list + +# tags = merge( +# local.base_tags, +# local.common_tags +# ) +} + +dependency "eks" { + config_path = "../eks" +} + +inputs = { + cluster_name = dependency.eks.inputs.cluster_name + profile = dependency.eks.inputs.profile + contact_email = "srinivasa.nangunuri@census.gov" +} diff --git a/lab/us-gov-east-1/vpc/mcmCluster/eks-config/terragrunt.hcl b/lab/us-gov-east-1/vpc/mcmCluster/eks-config/terragrunt.hcl index ae4a9c1..0482930 100644 --- a/lab/us-gov-east-1/vpc/mcmCluster/eks-config/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/mcmCluster/eks-config/terragrunt.hcl @@ -17,8 +17,7 @@ locals { tag_costallocation = "census:csvd:platformbaseline" region = "us-gov-east-1" tags = { - - "eks-cluster-name" = "platform-eng-eks-test" + "eks-cluster-name" = "platform-eng-eks-mcm" "CostAllocation" = "census:csvd:platformbaseline" "boc:tf_module_version" = "1.0.0" "boc:created_by" = "terraform" @@ -26,28 +25,13 @@ locals { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=lokiv3" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] } } -remote_state { - backend = "s3" - generate = { - path = "backend.tf" - if_exists = "overwrite_terragrunt" - } - config = { - bucket = "tg-infrastructure-tf-state-lab-dev-ew-us-gov-east-1" - key = "platform-eks-test-config/terraform.tfstate" - region = "us-gov-east-1" - encrypt = true - #dynamodb_table = "my-lock-table" - } -} - dependency "eks" { config_path = "../eks" } diff --git a/lab/us-gov-east-1/vpc/mcmCluster/eks-istio/terragrunt.hcl b/lab/us-gov-east-1/vpc/mcmCluster/eks-istio/terragrunt.hcl new file mode 100644 index 0000000..6e02208 --- /dev/null +++ b/lab/us-gov-east-1/vpc/mcmCluster/eks-istio/terragrunt.hcl @@ -0,0 +1,33 @@ +terraform { + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=1.0.4" + extra_arguments "retry_lock" { + commands = get_terraform_commands_that_need_locking() + arguments = ["-lock-timeout=20m"] + } +} + +remote_state { + backend = "s3" + generate = { + path = "backend.tf" + if_exists = "overwrite_terragrunt" + } + config = { + bucket = "tg-infrastructure-tf-state-lab-dev-ew-us-gov-east-1" + key = "platform-eks-test-istio/terraform.tfstate" + region = "us-gov-east-1" + encrypt = true + } +} + +dependency "eks" { + config_path = "../eks" +} + +inputs = { + profile = dependency.eks.inputs.profile + cluster_name = dependency.eks.inputs.cluster_name + region = "us-gov-east-1" + istio_chart_version = "1.22.1" + istio_version = "1.22.1" +} diff --git a/lab/us-gov-east-1/vpc/mcmCluster/eks-loki/terragrunt.hcl b/lab/us-gov-east-1/vpc/mcmCluster/eks-loki/terragrunt.hcl new file mode 100644 index 0000000..62a03c5 --- /dev/null +++ b/lab/us-gov-east-1/vpc/mcmCluster/eks-loki/terragrunt.hcl @@ -0,0 +1,32 @@ +terraform { + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-loki.git?ref=lokiv3" + extra_arguments "retry_lock" { + commands = get_terraform_commands_that_need_locking() + arguments = ["-lock-timeout=20m"] + } +} + +remote_state { + backend = "s3" + generate = { + path = "backend.tf" + if_exists = "overwrite_terragrunt" + } + config = { + bucket = "tg-infrastructure-tf-state-lab-dev-ew-us-gov-east-1" + key = "platform-eks-test-loki/terraform.tfstate" + region = "us-gov-east-1" + encrypt = true + } +} + +dependency "eks" { + config_path = "../eks" +} + +inputs = { + profile = dependency.eks.inputs.profile + cluster_name = dependency.eks.inputs.cluster_name + oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn + region = "us-gov-east-1" +}