From 129fe5bf3689801a5a3c0d4761a3935fc70a3167 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Tue, 11 Feb 2025 22:22:29 -0500 Subject: [PATCH] working --- .../eks-cert-manager/terragrunt.hcl | 4 ++-- .../eks-config/terragrunt.hcl | 2 +- .../eks-dns/terragrunt.hcl | 7 +++--- .../eks-grafana/terragrunt.hcl | 22 ++++++++--------- .../eks-istio/terragrunt.hcl | 4 ++-- .../eks-k8s-dashboard/terragrunt.hcl | 12 +++++----- .../eks-karpenter/terragrunt.hcl | 2 +- .../eks-kiali/terragrunt.hcl.disable | 2 +- .../eks-loki/terragrunt.hcl | 24 +++++++++---------- .../eks-metrics-server/terragrunt.hcl | 12 +++++----- .../eks-prometheus/terragrunt.hcl | 4 ++-- .../eks-tempo/terragrunt.hcl | 5 ++-- 12 files changed, 50 insertions(+), 50 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 1698f07..1005f35 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 @@ -14,7 +14,7 @@ terraform { dependency "eks" { config_path = "../eks" - mock_outputs_allowed_terraform_commands = ["init", "plan", "validate"] + mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] mock_outputs = { cluster_name = "a-cluster-name" oidc_provider_arn = "arn:aws-us-gov:iam::111111111111:oidc-provider/oidc.eks.us-gov-east-1.amazonaws.com/id/0000000000000000AAAAAAAAAAAAAAAA" @@ -22,7 +22,7 @@ dependency "eks" { } dependencies { - paths = ["../eks-config"] + paths = ["../eks-config", "../eks-karpenter"] } 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 72c6217..82f9b11 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 @@ -15,7 +15,7 @@ terraform { dependency "eks" { config_path = "../eks" - mock_outputs_allowed_terraform_commands = ["init", "plan", "validate"] + mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] mock_outputs = { cluster_certificate_authority_data = [{ data = "THISISAVERYLONGCERTSTRINGTHATGOESHEREFORSURENODYEP" }] cluster_endpoint = "https://12345ABCDEE42BF9C24D4C362D1DC.sk1.us-gov-east-1.eks.amazonaws.com" 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 ab62d3b..be3addc 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 @@ -14,7 +14,7 @@ terraform { dependency "eks" { config_path = "../eks" - mock_outputs_allowed_terraform_commands = ["init", "plan", "validate"] + mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] mock_outputs = { subnets = ["subnet-00000000000000001", "subnet-00000000000000002", "subnet-00000000000000003"] } @@ -22,7 +22,7 @@ dependency "eks" { dependency "istio" { config_path = "../eks-istio" - mock_outputs_allowed_terraform_commands = ["init", "plan", "validate"] + mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] mock_outputs = { istio_ingress_lb = { dns_name = "a1111111111111111111111111111111-2bbbbbbbbbbbbbbb.elb.us-gov-east-1.amazonaws.com" @@ -32,9 +32,8 @@ dependency "istio" { } dependencies { - paths = ["../eks-config", "../eks-istio"] + paths = ["../eks-karpenter", "../eks-config"] } - 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-grafana/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl index ca02842..d945f2e 100644 --- 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 @@ -14,7 +14,7 @@ terraform { dependency "eks" { config_path = "../eks" - mock_outputs_allowed_terraform_commands = ["init", "plan", "validate"] + mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] mock_outputs = { cluster_name = "a-cluster-name" } @@ -22,26 +22,26 @@ dependency "eks" { dependency "eks-loki" { config_path = "../eks-loki" - mock_outputs_allowed_terraform_commands = ["init", "plan", "validate"] + mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] mock_outputs = { rwo_storage_class = "gp3-encrypted" } } dependencies { - paths = ["../eks-config", "../eks-karpenter"] + paths = ["../eks-config", "../eks-karpenter", "../eks-dns"] } inputs = { - profile = include.root.inputs.aws_profile - region = include.root.inputs.aws_region + profile = dependency.eks.inputs.aws_profile + region = dependency.eks.inputs.aws_region cluster_name = dependency.eks.outputs.cluster_name cluster_domain = dependency.eks.inputs.vpc_domain_name - public_hostname = include.root.inputs.grafana_hostname + public_hostname = dependency.eks.inputs.grafana_hostname rwo_storage_class = dependency.eks-loki.outputs.rwo_storage_class - grafana_chart_version = include.root.inputs.grafana_chart_version - grafana_tag = include.root.inputs.grafana_tag - download_dashboards_image_tag = include.root.inputs.download_dashboards_image_tag - init_chown_data_image_tag = include.root.inputs.init_chown_data_image_tag - release_version = include.root.inputs.release_version + grafana_chart_version = dependency.eks.inputs.grafana_chart_version + grafana_tag = dependency.eks.inputs.grafana_tag + download_dashboards_image_tag = dependency.eks.inputs.download_dashboards_image_tag + init_chown_data_image_tag = dependency.eks.inputs.init_chown_data_image_tag + release_version = dependency.eks.inputs.release_version } 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 a65631d..eb7b9ca 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 @@ -14,14 +14,14 @@ terraform { dependency "eks" { config_path = "../eks" - mock_outputs_allowed_terraform_commands = ["init", "plan", "validate"] + mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] mock_outputs = { cluster_name = "a-cluster-name" } } dependencies { - paths = ["../eks-karpenter", "../eks-config"] + paths = ["../eks-karpenter", "../eks-config", "../eks-cert-manager"] } inputs = { 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 c02f084..be47974 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 @@ -14,7 +14,7 @@ terraform { dependency "eks" { config_path = "../eks" - mock_outputs_allowed_terraform_commands = ["init", "plan", "validate"] + mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] mock_outputs = { cluster_name = "a-cluster-name" vpc_domain_name = "example.com" @@ -22,15 +22,15 @@ dependency "eks" { } dependencies { - paths = ["../eks-loki", "../eks-config", "../eks-karpenter"] + paths = ["../eks-config", "../eks-karpenter", "../eks-dns"] } inputs = { - profile = include.root.inputs.aws_profile - region = include.root.inputs.aws_region + profile = dependency.eks.inputs.aws_profile + region = dependency.eks.inputs.aws_region cluster_name = dependency.eks.outputs.cluster_name cluster_domain = dependency.eks.inputs.vpc_domain_name - public_hostname = include.root.inputs.dashboard_hostname - k8s_dashboard_version = include.root.inputs.k8s_dashboard_version + public_hostname = dependency.eks.inputs.dashboard_hostname + k8s_dashboard_version = dependency.eks.inputs.k8s_dashboard_version # datasources = dependency.eks-loki.outputs.gateway_internal_endpoint } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl index 3fb7c11..8938179 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl @@ -14,7 +14,7 @@ terraform { dependency "eks" { config_path = "../eks" - mock_outputs_allowed_terraform_commands = ["init", "plan", "validate"] + mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] mock_outputs = { cluster_endpoint = "https://0000000000000000AAAAAAAAAAAAAAAA.sk1.us-gov-east-1.eks.amazonaws.com" cluster_name = "a-cluster-name" diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl.disable b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl.disable index e528771..27a255b 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl.disable +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl.disable @@ -15,7 +15,7 @@ terraform { dependency "eks" { config_path = "../eks" - mock_outputs_allowed_terraform_commands = ["init", "plan", "validate"] + mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] mock_outputs = { cluster_name = "a-cluster-name" } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-loki/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-loki/terragrunt.hcl index 0be4c16..b351429 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-loki/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-loki/terragrunt.hcl @@ -14,7 +14,7 @@ terraform { dependency "eks" { config_path = "../eks" - mock_outputs_allowed_terraform_commands = ["init", "plan", "validate"] + mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] mock_outputs = { cluster_name = "a-cluster-name" oidc_provider_arn = "arn:aws-us-gov:iam::111111111111:oidc-provider/oidc.eks.us-gov-east-1.amazonaws.com/id/0000000000000000AAAAAAAAAAAAAAAA" @@ -22,20 +22,20 @@ dependency "eks" { } dependencies { - paths = ["../eks-prometheus", "../eks-config", "../eks-karpenter", "../eks-istio"] + paths = ["../eks-config", "../eks-karpenter", "../eks-dns"] } inputs = { - profile = include.root.inputs.aws_profile - region = include.root.inputs.aws_region + profile = dependency.eks.inputs.aws_profile + region = dependency.eks.inputs.aws_region cluster_name = dependency.eks.outputs.cluster_name oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn - loki_chart_version = include.root.inputs.loki_chart_version - loki_tag = include.root.inputs.loki_tag - canary_tag = include.root.inputs.canary_tag - enterprise_logs_provisioner_tag = include.root.inputs.enterprise_logs_provisioner_tag - gateway_tag = include.root.inputs.gateway_tag - memcached_tag = include.root.inputs.memcached_tag - exporter_tag = include.root.inputs.exporter_tag - sidecar_tag = include.root.inputs.sidecar_tag + loki_chart_version = dependency.eks.inputs.loki_chart_version + loki_tag = dependency.eks.inputs.loki_tag + canary_tag = dependency.eks.inputs.canary_tag + enterprise_logs_provisioner_tag = dependency.eks.inputs.enterprise_logs_provisioner_tag + gateway_tag = dependency.eks.inputs.gateway_tag + memcached_tag = dependency.eks.inputs.memcached_tag + exporter_tag = dependency.eks.inputs.exporter_tag + sidecar_tag = dependency.eks.inputs.sidecar_tag } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl index 28bb273..08d7fc4 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl @@ -14,20 +14,20 @@ terraform { dependency "eks" { config_path = "../eks" - mock_outputs_allowed_terraform_commands = ["init", "plan", "validate"] + mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] mock_outputs = { cluster_name = "a-cluster-name" } } dependencies { - paths = ["../eks-config", "../eks-karpenter"] + paths = ["../eks-config", "../eks-karpenter", "../eks-dns"] } inputs = { - profile = include.root.inputs.aws_profile + profile = dependency.eks.inputs.aws_profile cluster_name = dependency.eks.outputs.cluster_name - region = include.root.inputs.aws_region - metrics_server_helm_chart = include.root.inputs.metrics_server_helm_chart - metrics_server_tag = include.root.inputs.metrics_server_tag + region = dependency.eks.inputs.aws_region + metrics_server_helm_chart = dependency.eks.inputs.metrics_server_helm_chart + metrics_server_tag = dependency.eks.inputs.metrics_server_tag } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-prometheus/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-prometheus/terragrunt.hcl index edc12b2..4c734f8 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-prometheus/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-prometheus/terragrunt.hcl @@ -14,14 +14,14 @@ terraform { dependency "eks" { config_path = "../eks" - mock_outputs_allowed_terraform_commands = ["init", "plan", "validate"] + mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] mock_outputs = { cluster_name = "a-cluster-name" } } dependencies { - paths = ["../eks-config", "../eks-karpenter", "../eks-istio", "../eks-dns"] + paths = ["../eks-config", "../eks-karpenter", "../eks-dns"] } inputs = { diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl index 9b1c9ac..f44e5c0 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl @@ -14,7 +14,7 @@ terraform { dependency "eks" { config_path = "../eks" - mock_outputs_allowed_terraform_commands = ["init", "plan", "validate"] + mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] mock_outputs = { cluster_name = "a-cluster-name" oidc_provider_arn = "arn:aws-us-gov:iam::111111111111:oidc-provider/oidc.eks.us-gov-east-1.amazonaws.com/id/0000000000000000AAAAAAAAAAAAAAAA" @@ -23,6 +23,7 @@ dependency "eks" { dependency "eks-prometheus" { config_path = "../eks-prometheus" + mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] mock_outputs = { prometheus_namespace = "prometheus" prometheus_server_internal_endpoint = { @@ -34,7 +35,7 @@ dependency "eks-prometheus" { } dependencies { - paths = ["../eks-config", "../eks-karpenter"] + paths = ["../eks-config", "../eks-karpenter", "../eks-dns"] } inputs = {