From e05d51b827ad5f67a7e30219795e8dfdb52acab8 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Fri, 7 Feb 2025 17:07:48 -0500 Subject: [PATCH] turn modules on again --- .../{terragrunt.hcl.off => terragrunt.hcl} | 6 +++++ .../{terragrunt.hcl.off => terragrunt.hcl} | 22 ++++-------------- .../{terragrunt.hcl.off => terragrunt.hcl} | 23 ++++--------------- .../{terragrunt.hcl.off => terragrunt.hcl} | 23 +++++-------------- .../{terragrunt.hcl.off => terragrunt.hcl} | 0 5 files changed, 22 insertions(+), 52 deletions(-) rename lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/{terragrunt.hcl.off => terragrunt.hcl} (92%) rename lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/{terragrunt.hcl.off => terragrunt.hcl} (77%) rename lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/{terragrunt.hcl.off => terragrunt.hcl} (70%) rename lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/{terragrunt.hcl.off => terragrunt.hcl} (59%) rename lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/{terragrunt.hcl.off => terragrunt.hcl} (100%) diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl.off b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl similarity index 92% rename from lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl.off rename to lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl index 407d973..67340a0 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl.off +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl @@ -1,3 +1,9 @@ +include "root" { + path = find_in_parent_folders("root.hcl") + merge_strategy = "deep" + expose = true +} + terraform { source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=no-kubectl" extra_arguments "retry_lock" { diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl.off b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl similarity index 77% rename from lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl.off rename to lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl index f44dbe4..5c32c25 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl.off +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl @@ -1,4 +1,9 @@ # lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl +include "root" { + path = find_in_parent_folders("root.hcl") + merge_strategy = "deep" + expose = true +} terraform { source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=main" @@ -28,23 +33,6 @@ dependencies { paths = ["../eks", "../eks-karpenter"] } -locals { - helm = read_terragrunt_config(find_in_parent_folders("./_envcommon/helm-provider.hcl")) - kube = read_terragrunt_config(find_in_parent_folders("./_envcommon/kube-provider.hcl")) -} - -generate "helm" { - path = local.helm.generate.helm_provider.path - if_exists = local.helm.generate.helm_provider.if_exists - contents = local.helm.generate.helm_provider.contents -} - -generate "kube" { - path = local.kube.generate.kube_provider.path - if_exists = local.kube.generate.kube_provider.if_exists - contents = local.kube.generate.kube_provider.contents -} - inputs = { cluster_name = dependency.eks.outputs.cluster_name region = dependency.eks.inputs.aws_region diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl.off b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl similarity index 70% rename from lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl.off rename to lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl index cd51906..011efb4 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl.off +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl @@ -1,3 +1,8 @@ +include "root" { + path = find_in_parent_folders("root.hcl") + merge_strategy = "deep" + expose = true +} terraform { source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git?ref=main" @@ -30,24 +35,6 @@ dependencies { paths = ["../eks", "../eks-config", "../eks-istio"] } - -locals { - helm = read_terragrunt_config(find_in_parent_folders("./_envcommon/helm-provider.hcl")) - kube = read_terragrunt_config(find_in_parent_folders("./_envcommon/kube-provider.hcl")) -} - -generate "helm" { - path = local.helm.generate.helm_provider.path - if_exists = local.helm.generate.helm_provider.if_exists - contents = local.helm.generate.helm_provider.contents -} - -generate "kube" { - path = local.kube.generate.kube_provider.path - if_exists = local.kube.generate.kube_provider.if_exists - contents = local.kube.generate.kube_provider.contents -} - inputs = { cluster_name = dependency.eks.inputs.cluster_name istio_ingress_lb = dependency.istio.outputs.istio_ingress_lb diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl.off b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl similarity index 59% rename from lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl.off rename to lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl index 3c8bcca..4368d6e 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl.off +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl @@ -1,3 +1,9 @@ +include "root" { + path = find_in_parent_folders("root.hcl") + merge_strategy = "deep" + expose = true +} + terraform { source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=main" extra_arguments "retry_lock" { @@ -18,23 +24,6 @@ dependencies { paths = ["../eks", "../eks-karpenter", "../eks-config"] } -locals { - helm = read_terragrunt_config(find_in_parent_folders("./_envcommon/helm-provider.hcl")) - kube = read_terragrunt_config(find_in_parent_folders("./_envcommon/kube-provider.hcl")) -} - -generate "helm" { - path = local.helm.generate.helm_provider.path - if_exists = local.helm.generate.helm_provider.if_exists - contents = local.helm.generate.helm_provider.contents -} - -generate "kube" { - path = local.kube.generate.kube_provider.path - if_exists = local.kube.generate.kube_provider.if_exists - contents = local.kube.generate.kube_provider.contents -} - inputs = { cluster_name = dependency.eks.outputs.cluster_name istio_chart_version = dependency.eks.inputs.istio_version diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl.off b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl similarity index 100% rename from lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl.off rename to lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl