fmt

SCT-Engineering · Feb 13, 2025 · 09ec4db · 09ec4db
1 parent a0623bb
commit 09ec4db
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,35 +22,27 @@ 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"
     subnets           = ["subnet-mock1", "subnet-mock2"]
   }
 }
 
-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
@@ -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
@@ -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
@@ -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