From 7e17b6241d028270463d2b1702ae69bea64585db Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Mon, 3 Feb 2025 18:11:39 -0500 Subject: [PATCH] include once --- lab/_envcommon/helm-provider.hcl | 1 + lab/_envcommon/kube-provider.hcl | 1 + .../eks-config/terragrunt.hcl | 32 +++++++++---------- .../platform-eng-eks-mcm/eks/terragrunt.hcl | 1 + 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/lab/_envcommon/helm-provider.hcl b/lab/_envcommon/helm-provider.hcl index 2cca99d..8d3f576 100644 --- a/lab/_envcommon/helm-provider.hcl +++ b/lab/_envcommon/helm-provider.hcl @@ -1,5 +1,6 @@ dependency "eks" { config_path = "${get_original_terragrunt_dir()}/../eks" + skip_outputs = false } inputs = { diff --git a/lab/_envcommon/kube-provider.hcl b/lab/_envcommon/kube-provider.hcl index ac9af34..2da5014 100644 --- a/lab/_envcommon/kube-provider.hcl +++ b/lab/_envcommon/kube-provider.hcl @@ -1,5 +1,6 @@ dependency "eks" { config_path = "${get_original_terragrunt_dir()}/../eks" + skip_outputs = false } inputs = { 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 index fa03311..197baad 100644 --- 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 @@ -10,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 { @@ -40,10 +40,10 @@ generate "kube" { } inputs = { - 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 + 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/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl index 7870b02..5bb79a7 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 @@ -11,6 +11,7 @@ terraform { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] } + } inputs = {