dryer

SCT-Engineering · Feb 3, 2025 · 16e5ce7 · 16e5ce7
1 parent d5c00a2
commit 16e5ce7
Show file tree

Hide file tree

Showing 13 changed files with 97 additions and 424 deletions.
diff --git a/lab/_envcommon/helm-provider.hcl b/lab/_envcommon/helm-provider.hcl
@@ -1,12 +1,9 @@
 dependency "eks" {
   config_path = "${get_original_terragrunt_dir()}/../eks"
-  mock_outputs = {
-    cluster_name = "a-cluster-name"
-  }
 }
 
 inputs = {
-  cluster_name = dependency.eks.outputs.cluster_name
+  cluster_name = dependency.eks.inputs.cluster_name
 }
 
 # Generate a k8s provider block
@@ -15,10 +12,10 @@ generate "helm_provider" {
   if_exists = "overwrite_terragrunt"
   contents  = <<-EOF
   data "aws_eks_cluster" "helm" {
-    name = "${dependency.eks.outputs.cluster_name}"
+    name = "${dependency.eks.inputs.cluster_name}"
   }
   data "aws_eks_cluster_auth" "helm" {
-    name = "${dependency.eks.outputs.cluster_name}"
+    name = "${dependency.eks.inputs.cluster_name}"
   }
   provider "helm" {
     kubernetes {

diff --git a/lab/_envcommon/kube-provider.hcl b/lab/_envcommon/kube-provider.hcl
@@ -1,12 +1,9 @@
 dependency "eks" {
   config_path = "${get_original_terragrunt_dir()}/../eks"
-  mock_outputs = {
-    cluster_name = "a-cluster-name"
-  }
 }
 
 inputs = {
-  cluster_name = dependency.eks.outputs.cluster_name
+  cluster_name = dependency.eks.inputs.cluster_name
 }
 
 # Generate a k8s provider block
@@ -15,10 +12,10 @@ generate "kube_provider" {
   if_exists = "overwrite_terragrunt"
   contents  = <<-EOF
   data "aws_eks_cluster" "kube" {
-    name = "${dependency.eks.outputs.cluster_name}"
+    name = "${dependency.eks.inputs.cluster_name}"
   }
   data "aws_eks_cluster_auth" "kube" {
-    name = "${dependency.eks.outputs.cluster_name}"
+    name = "${dependency.eks.inputs.cluster_name}"
   }
   provider "kubernetes" {
     host                   = data.aws_eks_cluster.kube.endpoint

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
@@ -1,9 +1,3 @@
-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" {
@@ -25,34 +19,34 @@ dependency "eks_config" {
   skip_outputs = true
 }
 
-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"))
-}
+# 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 "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
-}
+# 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 = {
-  cert_manager_cainjector_tag      = include.root.inputs.cert_manager_cainjector_tag
-  cert_manager_controller_tag      = include.root.inputs.cert_manager_controller_tag
-  cert_manager_helm_chart          = include.root.inputs.cert_manager_helm_chart
-  cert_manager_startupapicheck_tag = include.root.inputs.cert_manager_startupapicheck_tag
-  cert_manager_webhook_tag         = include.root.inputs.cert_manager_webhook_tag
-  cluster_issuer_name              = include.root.inputs.cluster_issuer_name
+  cert_manager_cainjector_tag      = dependency.eks.inputs.cert_manager_cainjector_tag
+  cert_manager_controller_tag      = dependency.eks.inputs.cert_manager_controller_tag
+  cert_manager_helm_chart          = dependency.eks.inputs.cert_manager_helm_chart
+  cert_manager_startupapicheck_tag = dependency.eks.inputs.cert_manager_startupapicheck_tag
+  cert_manager_webhook_tag         = dependency.eks.inputs.cert_manager_webhook_tag
+  cluster_issuer_name              = dependency.eks.inputs.cluster_issuer_name
   cluster_mailing_list             = dependency.eks.inputs.creator
   cluster_name                     = dependency.eks.outputs.cluster_name
   oidc_provider_arn                = dependency.eks.outputs.oidc_provider_arn
-  profile                          = include.root.inputs.aws_profile
-  region                           = include.root.inputs.aws_region
-  release_version                  = include.root.inputs.release_version
+  profile                          = dependency.eks.inputs.aws_profile
+  region                           = dependency.eks.inputs.aws_region
+  release_version                  = dependency.eks.inputs.release_version
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl
@@ -1,11 +1,5 @@
 # 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"
   extra_arguments "retry_lock" {
@@ -16,16 +10,16 @@ terraform {
 
 dependency "eks" {
   config_path = "../eks"
-  mock_outputs = {
-    cluster_certificate_authority_data              = [{ data = "THISISAVERYLONGCERTSTRINGTHATGOESHEREFORSURENODYEP" }]
-    cluster_endpoint                                = "https://12345ABCDEE42BF9C24D4C362D1DC.sk1.us-gov-east-1.eks.amazonaws.com"
-    cluster_name                                    = "a-cluster-name"
-    eks_managed_node_groups_autoscaling_group_names = ["eks-eks-a-cluster-name-node_group-0000000000000000000000000-5ac8a5e3-14dd-c043-2cc9-f4b6ffb36d32"]
-    oidc_provider_arn                               = "arn:aws-us-gov:iam::111111111111:oidc-provider/oidc.eks.us-gov-east-1.amazonaws.com/id/0000000000000000AAAAAAAAAAAAAAAA"
-    security_group_all_worker_mgmt_id               = "sg-00b0000000000000"
-    subnets                                         = ["subnet-00000000000000001", "subnet-00000000000000002", "subnet-00000000000000003"]
-    vpc_id                                          = "a-vpc-id"
-  }
+  # mock_outputs = {
+  #   cluster_certificate_authority_data              = [{ data = "THISISAVERYLONGCERTSTRINGTHATGOESHEREFORSURENODYEP" }]
+  #   cluster_endpoint                                = "https://12345ABCDEE42BF9C24D4C362D1DC.sk1.us-gov-east-1.eks.amazonaws.com"
+  #   cluster_name                                    = "a-cluster-name"
+  #   eks_managed_node_groups_autoscaling_group_names = ["eks-eks-a-cluster-name-node_group-0000000000000000000000000-5ac8a5e3-14dd-c043-2cc9-f4b6ffb36d32"]
+  #   oidc_provider_arn                               = "arn:aws-us-gov:iam::111111111111:oidc-provider/oidc.eks.us-gov-east-1.amazonaws.com/id/0000000000000000AAAAAAAAAAAAAAAA"
+  #   security_group_all_worker_mgmt_id               = "sg-00b0000000000000"
+  #   subnets                                         = ["subnet-00000000000000001", "subnet-00000000000000002", "subnet-00000000000000003"]
+  #   vpc_id                                          = "a-vpc-id"
+  # }
 }
 
 locals {
@@ -46,12 +40,9 @@ generate "kube" {
 }
 
 inputs = {
-  cluster_name                                    = dependency.eks.outputs.cluster_name
-  eks_managed_node_groups_autoscaling_group_names = dependency.eks.outputs.eks_managed_node_groups_autoscaling_group_names
-  oidc_provider_arn                               = dependency.eks.outputs.oidc_provider_arn
-  profile                                         = include.root.inputs.aws_profile
-  region                                          = include.root.inputs.aws_region
-  release_version                                 = include.root.inputs.release_version
+  cluster_name                                    = dependency.eks.inputs.cluster_name
+  region                                          = dependency.eks.inputs.aws_region
+  release_version                                 = dependency.eks.inputs.release_version
   security_group_all_worker_mgmt_id               = dependency.eks.outputs.security_group_all_worker_mgmt_id
   subnets                                         = dependency.eks.outputs.subnets
   vpc_id                                          = dependency.eks.outputs.vpc_id

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
@@ -1,8 +1,3 @@
-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=${include.root.inputs.release_version}"
@@ -29,29 +24,29 @@ dependency "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"))
-}
+# 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 "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
-}
+# 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
-  profile           = include.root.inputs.aws_profile
-  region            = include.root.inputs.aws_region
-  route53_endpoints = include.root.inputs.route53_endpoints
+  profile           = dependency.eks.inputs.aws_profile
+  region            = dependency.eks.inputs.aws_region
+  route53_endpoints = dependency.eks.inputs.route53_endpoints
   subnets           = dependency.eks.outputs.subnets
   tags              = dependency.eks.inputs.tags
   vpc_domain_name   = dependency.eks.inputs.vpc_domain_name

diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl
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
@@ -1,9 +1,3 @@
-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=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
@@ -24,27 +18,27 @@ dependency "eks-karpenter" {
   skip_outputs = true
 }
 
-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"))
-}
+# 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 "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
-}
+# 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 = include.root.inputs.istio_version
-  istio_version       = include.root.inputs.istio_version
-  profile             = include.root.inputs.aws_profile
-  region              = include.root.inputs.aws_region
+  istio_chart_version = dependency.eks.inputs.istio_version
+  istio_version       = dependency.eks.inputs.istio_version
+  profile             = dependency.eks.inputs.aws_profile
+  region              = dependency.eks.inputs.aws_region
 }