From 09ec4db07826f98672fe0260e6fc85c0200e8aec Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Wed, 12 Feb 2025 21:52:46 -0500 Subject: [PATCH] fmt --- .../eks-cert-manager/terragrunt.hcl | 7 ++-- .../eks-config/terragrunt.hcl | 7 ++-- .../eks-dns/terragrunt.hcl | 6 +-- .../eks-k8s-dashboard/terragrunt.hcl | 23 ++++++----- .../eks-karpenter/terragrunt.hcl | 39 ++++++++++--------- .../eks-prometheus/terragrunt.hcl | 4 +- .../eks-tempo/terragrunt.hcl | 4 +- .../platform-eng-eks-mcm/eks/terragrunt.hcl | 5 ++- 8 files changed, 51 insertions(+), 44 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 e25b072..5ceaeae 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 @@ -35,8 +35,9 @@ dependency "eks" { inputs = { # AWS Configuration - profile = include.root.inputs.aws_profile - region = include.root.inputs.aws_region + account_id = include.root.inputs.aws_account_id + profile = include.root.inputs.aws_profile + region = include.root.inputs.aws_region # Cluster Configuration cluster_name = dependency.eks.outputs.cluster_name @@ -47,7 +48,7 @@ inputs = { cert_manager_helm_chart = include.root.inputs.cert_manager_helm_chart cluster_issuer_name = include.root.inputs.cluster_issuer_name - # Version Configuration + # Version Tags cert_manager_cainjector_tag = include.root.inputs.cert_manager_cainjector_tag cert_manager_controller_tag = include.root.inputs.cert_manager_controller_tag cert_manager_startupapicheck_tag = include.root.inputs.cert_manager_startupapicheck_tag 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 2bbcc9d..9576f23 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 @@ -38,8 +38,9 @@ dependency "eks" { inputs = { # AWS Configuration - profile = include.root.inputs.aws_profile - region = include.root.inputs.aws_region + account_id = include.root.inputs.aws_account_id + profile = include.root.inputs.aws_profile + region = include.root.inputs.aws_region # Core Cluster Configuration cluster_name = dependency.eks.outputs.cluster_name @@ -49,6 +50,4 @@ inputs = { subnets = dependency.eks.outputs.subnets vpc_id = dependency.eks.outputs.vpc_id - # Additional Configuration - kubectl_image_tag = include.root.inputs.kubectl_image_tag } 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 c302416..86fdfbd 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 @@ -51,9 +51,9 @@ inputs = { # Network Configuration istio_ingress_lb = dependency.istio.outputs.istio_ingress_lb route53_endpoints = include.root.inputs.route53_endpoints - subnets = dependency.eks.outputs.subnets - vpc_domain_name = include.root.inputs.vpc_domain_name - vpc_name = include.root.inputs.vpc_name + subnets = dependency.eks.outputs.subnets + vpc_domain_name = include.root.inputs.vpc_domain_name + vpc_name = include.root.inputs.vpc_name # Additional Configuration tags = include.root.inputs.tags 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 4d8801f..3e6e80d 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 @@ -4,6 +4,14 @@ include "root" { expose = true } +terraform { + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-k8s-dashboard.git?ref=${include.root.inputs.release_version}" + extra_arguments "retry_lock" { + commands = get_terraform_commands_that_need_locking() + arguments = ["-lock-timeout=20m"] + } +} + dependencies { paths = [ "../eks", @@ -15,20 +23,17 @@ dependency "eks" { config_path = "../eks" mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] mock_outputs = { - cluster_name = "mock-cluster" + cluster_name = include.root.inputs.cluster_name oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock" } } -terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-k8s-dashboard.git?ref=${include.root.inputs.release_version}" - extra_arguments "retry_lock" { - commands = get_terraform_commands_that_need_locking() - arguments = ["-lock-timeout=20m"] - } -} - inputs = { + # AWS Configuration + account_id = include.root.inputs.aws_account_id + profile = include.root.inputs.aws_profile + region = include.root.inputs.aws_region + # Cluster Configuration cluster_name = dependency.eks.outputs.cluster_name 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 d06414f..6d1aeb2 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 @@ -4,6 +4,15 @@ include "root" { expose = true } +terraform { + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=${include.root.inputs.release_version}" + + extra_arguments "retry_lock" { + commands = get_terraform_commands_that_need_locking() + arguments = ["-lock-timeout=20m"] + } +} + dependencies { paths = ["../eks"] } @@ -13,7 +22,7 @@ dependency "eks" { mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] mock_outputs = { - cluster_name = "mock-cluster" + cluster_name = include.root.inputs.cluster_name cluster_endpoint = "https://mock-endpoint.eks.amazonaws.com" oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock" vpc_id = "vpc-mock" @@ -21,27 +30,19 @@ dependency "eks" { } } -terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=${include.root.inputs.release_version}" - - extra_arguments "retry_lock" { - commands = get_terraform_commands_that_need_locking() - arguments = ["-lock-timeout=20m"] - } -} - inputs = { - # Core configuration + # AWS Configuration + account_id = include.root.inputs.aws_account_id + profile = include.root.inputs.aws_profile + region = include.root.inputs.aws_region + + # Cluster Configuration cluster_name = dependency.eks.outputs.cluster_name - vpc_id = dependency.eks.outputs.vpc_id - subnets = dependency.eks.outputs.subnets oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn + subnets = dependency.eks.outputs.subnets + vpc_id = dependency.eks.outputs.vpc_id - # Karpenter configuration - karpenter_version = include.root.inputs.karpenter_version + # Karpenter Configuration karpenter_tag = include.root.inputs.karpenter_tag - - # AWS configuration - profile = include.root.inputs.aws_profile - region = include.root.inputs.aws_region + karpenter_version = include.root.inputs.karpenter_version } 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 a51af22..1c68911 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 @@ -40,6 +40,6 @@ inputs = { # Prometheus Configuration prometheus_version = include.root.inputs.prometheus_version - retention_days = include.root.inputs.prometheus_retention_days - storage_class = include.root.inputs.storage_class + retention_days = include.root.inputs.prometheus_retention_days + storage_class = include.root.inputs.storage_class } 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 e47f0d3..14f2267 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 @@ -56,9 +56,9 @@ inputs = { # Prometheus Configuration prometheus_namespace = dependency.eks-prometheus.outputs.prometheus_namespace - prometheus_port = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.port_number + prometheus_port = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.port_number # Tempo Configuration tempo_chart_version = include.root.inputs.tempo_chart_version - tempo_tag = include.root.inputs.tempo_tag + tempo_tag = include.root.inputs.tempo_tag } 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 1ea01e3..a10eb79 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 @@ -15,8 +15,9 @@ terraform { inputs = { # AWS Configuration - profile = include.root.inputs.aws_profile - region = include.root.inputs.aws_region + account_id = include.root.inputs.aws_account_id + profile = include.root.inputs.aws_profile + region = include.root.inputs.aws_region # Core Cluster Configuration cluster_name = include.root.inputs.cluster_name