use default for eks again

SCT-Engineering · Mar 13, 2025 · 5923146 · 5923146
1 parent f649b29
commit 5923146
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-keycloak/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-keycloak/terragrunt.hcl
@@ -8,7 +8,7 @@ terraform {
   source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-keycloak.git?ref=standards"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
-    arguments = ["-lock-timeout=20m"]
+    arguments = ["-lock-timeout=20s"]
   }
 }
 
@@ -21,18 +21,29 @@ dependency "eks" {
   }
 }
 
+dependencies {
+  paths = [
+    "../eks",
+    "../eks-config",
+    "../eks-dns",
+    "../eks-karpenter",
+    "../eks-prometheus"
+  ]
+}
+
 inputs = {
+  admin_email         = include.root.inputs.creator
+  cluster_domain      = include.root.inputs.vpc_domain_name
+  cluster_name        = dependency.eks.outputs.cluster_name
+  environment         = include.root.inputs.environment
+  namespace           = include.root.inputs.keycloak_namespace
   profile             = include.root.inputs.aws_profile
   region              = include.root.inputs.aws_region
-  environment         = include.root.inputs.environment
-  cluster_name        = dependency.eks.outputs.cluster_name
-  cluster_domain      = include.root.inputs.vpc_domain_name
-  keycloak_version    = include.root.inputs.keycloak_chart_version
-  keycloak_tag        = include.root.inputs.keycloak_app_version
+
+  # keycloak config
   keycloak_hostname   = include.root.inputs.keycloak_hostname
-  namespace           = include.root.inputs.keycloak_namespace
-  admin_email         = include.root.inputs.creator
-  database_subnet_ids = dependency.eks.outputs.database_subnet_ids
+  keycloak_tag        = include.root.inputs.keycloak_app_version
+  keycloak_version    = include.root.inputs.keycloak_chart_version
 
   # Database configuration
   db_engine        = "aurora-postgresql"

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
@@ -5,7 +5,7 @@ include "root" {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=provider-resolution"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=${include.root.inputs.release_version}"
 
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()