From 5d2d47e401f529e8625f31339f7ae8779470ec2c Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Thu, 27 Feb 2025 23:26:15 -0500
Subject: [PATCH] more wip:

---
 lab/_envcommon/default-versions.hcl           | 21 ++++++++++++++-----
 .../eks-postgresql/terragrunt.hcl             | 14 ++++++-------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
index 7d186cb4..5ce17d59 100644
--- a/lab/_envcommon/default-versions.hcl
+++ b/lab/_envcommon/default-versions.hcl
@@ -31,8 +31,12 @@ locals {
     karpenter      = "karpenter"
     metrics-server = "kube-system"
     postgresql     = "kube-system"
+<<<<<<< HEAD
     keycloak       = "keycloak"
     gogatekeeper   = "kube-system"
+=======
+    keycloak       = "kube-system"
+>>>>>>> 2829581 (more wip:)
     istio          = "istio-system"
     kiali          = "istio-system"
     grafana        = local.telemetry_namespace
@@ -110,6 +114,13 @@ locals {
   keycloak_password      = "this is my very secure and totally random password horse battery staple now"
   postgresql_tag         = "17.4.0-debian-12-r2"
 
+  ################
+  # Keycloak
+  ################
+  keycloak_chart_version = "24.4.10"
+  keycloak_tag           = "26.1.2"
+  keycloak_hostname      = "keycloak"
+
   ################
   # Kiali
   ################
@@ -136,12 +147,12 @@ locals {
   ################
   # PostgreSQL
   ################
-  os_shell_tag = "12"
-  postgres_exporter_tag = "0.16.0"
-  postgresql_repmgr_tag = "17.4.0"
-  pgpool_tag = "4.5.5"
+  os_shell_tag             = "12"
+  postgres_exporter_tag    = "0.16.0"
+  postgresql_repmgr_tag    = "17.4.0"
+  pgpool_tag               = "4.5.5"
   postgresql_chart_version = "15.3.0"
-  postgresql_tag = "17.4.0"
+  postgresql_tag           = "17.4.0"
 
   ################
   # Prometheus
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
index 8c61965f..eabc5032 100644
--- 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
@@ -53,16 +53,16 @@ inputs = {
   region     = include.root.inputs.aws_region
 
   # Cluster Configuration
-  cluster_domain = dependency.eks_dns.outputs.cluster_domain
-  cluster_name   = dependency.eks.outputs.cluster_name
+  cluster_domain    = dependency.eks_dns.outputs.cluster_domain
+  cluster_name      = dependency.eks.outputs.cluster_name
   rwo_storage_class = dependency.eks_config.outputs.rwo_storage_class
 
   # PostgreSQL Configuration
-  service_name       = "postgresql"
-  os_shell_tag         = include.root.inputs.os_shell_tag
+  service_name          = "postgresql"
+  os_shell_tag          = include.root.inputs.os_shell_tag
   postgres_exporter_tag = include.root.inputs.postgres_exporter_tag
-  postgresql_tag      = include.root.inputs.postgresql_tag
+  postgresql_tag        = include.root.inputs.postgresql_tag
   postgresql_repmgr_tag = include.root.inputs.postgresql_repmgr_tag
-  pgpool_tag         = include.root.inputs.pgpool_tag
-  namespace = include.root.inputs.namespaces["postgresql"]
+  pgpool_tag            = include.root.inputs.pgpool_tag
+  namespace             = include.root.inputs.namespaces["postgresql"]
 }