From 35e31220a0000285145024c94008a379cfbeb5af Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Tue, 15 Oct 2024 20:34:26 -0400 Subject: [PATCH] reset to base --- .../eks-cert-manager/terragrunt.hcl | 15 ++++++++++----- .../platform-eng-eks-mcm/eks-dns/terragrunt.hcl | 4 +--- .../platform-eng-eks-mcm/eks-istio/terragrunt.hcl | 2 +- .../eks-k8s-dashboard/terragrunt.hcl | 3 +-- .../vpc/platform-eng-eks-mcm/eks/terragrunt.hcl | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl index 1448ac8..4d2f04f 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl @@ -19,16 +19,21 @@ dependency "eks" { } } +dependency "karpenter" { + config_path = "../eks-karpenter" + skip_outputs = true +} + inputs = { cluster_name = dependency.eks.outputs.cluster_name cluster_mailing_list = dependency.eks.inputs.creator oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn profile = include.root.inputs.aws_profile region = include.root.inputs.aws_region - cert_manager_helm_chart = "1.15.1" - cert_manager_cainjector_tag = "v1.15.1" - cert_manager_controller_tag = "v1.15.1" - cert_manager_startupapicheck_tag = "v1.15.1" - cert_manager_webhook_tag = "v1.15.1" + cert_manager_helm_chart = "1.16.1" + cert_manager_cainjector_tag = "v1.16.1" + cert_manager_controller_tag = "v1.16.1" + cert_manager_startupapicheck_tag = "v1.16.1" + cert_manager_webhook_tag = "v1.16.1" cluster_issuer_name = "cert-manager" } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl index 01c08b2..4205398 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl @@ -4,7 +4,7 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git?ref=module" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] @@ -15,7 +15,6 @@ dependency "eks" { config_path = "../eks" mock_outputs = { subnets = ["subnet-abcdefgh", "subnet-12345678", "subnet-ab12cd34"] - vpc_id = "vpc-abcdefgh01234567" } } @@ -34,6 +33,5 @@ inputs = { subnets = dependency.eks.outputs.subnets tags = dependency.eks.inputs.tags vpc_domain_name = dependency.eks.inputs.vpc_domain_name - vpc_id = dependency.eks.outputs.vpc_id vpc_name = dependency.eks.inputs.vpc_name } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl index d1c79b8..5a30c0e 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl @@ -4,7 +4,7 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=main" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl index 12acefb..f1b81fe 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl @@ -5,8 +5,7 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-k8s-dashboard.git" - # source = "../../../../../../../tfmod-k8s-dashboard" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-k8s-dashboard.git?ref=main" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl index 1b22463..86db893 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl @@ -36,7 +36,7 @@ locals { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=main" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"]