wip

lab/_envcommon/default-versions.hcl

@@ -89,12 +89,13 @@ locals {
   ################
   # Keycloak
   ################
-  keycloak_chart_version = "24.4.10"
-  keycloak_tag           = "26.1.2"
+  keycloak_chart_version = "24.4.11"
+  keycloak_tag           = "26.1.3"
   keycloak_hostname      = "keycloak"
-  postgresql_database = "keycloak_db"
-  postgresql_username = "keycloak_user"
-  postgresql_password = "secure_password"
+  keycloak_database = "keycloak_db"
+  keycloak_username = "keycloak_user"
+  # keycloak_password = "secure_password"
+  postgresql_tag           = "17.4.0-debian-12-r2"
 
   ################
   # Kiali
@@ -128,7 +129,6 @@ locals {
   postgresql_repmgr_tag    = "17.4.0"
   pgpool_tag               = "4.5.5"
   postgresql_chart_version = "15.3.0"
-  postgresql_tag           = "17.4.0"
 
   ################
   # Prometheus

lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-keycloak/terragrunt.hcl

@@ -38,23 +38,12 @@ 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-postgresql",
     "../eks-prometheus",
   ]
 }
@@ -75,11 +64,11 @@ inputs = {
   service_name           = "keycloak"
   telemetry_namespace    = include.root.inputs.telemetry_namespace
 
-  # 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
+  # # Database configuration
+  # db_host = dependency.eks_postgresql.outputs.internal_endpoint.url
+  keycloak_database = include.root.inputs.keycloak_database
+  # keycloak_password = include.root.inputs.keycloak_password
+  keycloak_user = include.root.inputs.keycloak_username
 
   # Project information
   project_name = include.root.inputs.project_name

lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl

@@ -17,7 +17,6 @@ dependencies {
     "../eks",
     "../eks-config",
     "../eks-dns",
-    "../eks-grafana",
     "../eks-istio",
     "../eks-prometheus"
   ]