keycloak wip

SCT-Engineering · Mar 11, 2025 · f16d8d3 · f16d8d3
1 parent c4a7910
commit f16d8d3
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 10 deletions.
diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
@@ -92,6 +92,9 @@ locals {
   keycloak_chart_version = "24.4.10"
   keycloak_tag           = "26.1.2"
   keycloak_hostname      = "keycloak"
+  postgresql_database = "keycloak_db"
+  postgresql_username = "keycloak_user"
+  postgresql_password = "secure_password"
 
   ################
   # Kiali

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
@@ -38,13 +38,24 @@ dependency "eks_dns" {
   }
 }
 
+dependency "eks_postgresql" {
+  config_path                             = "../eks-postgresql"
+  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
+  mock_outputs = {
+    internal_endpoint {      
+      url = "mock-internal-endpoint-url"
+    }
+  }
+}
+
 dependencies {
   paths = [
     "../eks",
     "../eks-config",
     "../eks-dns",
     "../eks-karpenter",
-    "../eks-prometheus"
+    "../eks-postgresql",
+    "../eks-prometheus",
   ]
 }
 
@@ -57,20 +68,18 @@ inputs = {
   region         = include.root.inputs.aws_region
 
   # keycloak config
+  default_storage_class  = dependency.eks_config.outputs.rwo_storage_class
+  keycloak_chart_version = include.root.inputs.keycloak_chart_version
   keycloak_hostname      = include.root.inputs.keycloak_hostname
   keycloak_tag           = include.root.inputs.keycloak_tag
-  keycloak_chart_version = include.root.inputs.keycloak_chart_version
-  default_storage_class  = dependency.eks_config.outputs.rwo_storage_class
   service_name           = "keycloak"
   telemetry_namespace    = include.root.inputs.telemetry_namespace
 
-  # # Database configuration
-  postgresql_host = dependency.eks_postgresql.outputs.internal_endpoint.url
-
-  db_engine = "postgresql"
-  # db_instance_type = "db.t4g.medium"
-  db_name = "keycloak_db"
-  db_user = "keycloak"
+  # Database configuration
+  db_host = dependency.eks_postgresql.outputs.internal_endpoint.url
+  db_name = include.root.inputs.postgresql_database
+  db_password = include.root.inputs.postgresql_password
+  db_user = include.root.inputs.postgresql_username
 
   # Project information
   project_name = include.root.inputs.project_name

diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-postgresql/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-postgresql/terragrunt.hcl
@@ -65,4 +65,9 @@ inputs = {
   postgresql_repmgr_tag = include.root.inputs.postgresql_repmgr_tag
   pgpool_tag            = include.root.inputs.pgpool_tag
   namespace             = include.root.inputs.namespaces["postgresql"]
+
+  # Database Consumer Configuration
+  postgresql_database = include.root.inputs.postgresql_database
+  postgresql_username = include.root.inputs.postgresql_username
+  postgresql_password = include.root.inputs.postgresql_password
 }