From 66d964aa75c47dc86be97bc0223776858c49e542 Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Mon, 3 Mar 2025 17:40:25 -0500
Subject: [PATCH] wip

---
 lab/_envcommon/default-versions.hcl           | 12 +--
 .../eks-keycloak/terragrunt.hcl               | 10 ---
 .../eks-kiali/terragrunt.hcl                  |  1 -
 .../eks-postgresql/terragrunt.hcl             | 76 -------------------
 4 files changed, 6 insertions(+), 93 deletions(-)
 delete mode 100644 lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-postgresql/terragrunt.hcl

diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
index 7aca861d..13931fbd 100644
--- a/lab/_envcommon/default-versions.hcl
+++ b/lab/_envcommon/default-versions.hcl
@@ -117,12 +117,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
@@ -155,7 +156,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
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
index 3d11fdf1..74132d72 100644
--- 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
@@ -37,16 +37,6 @@ 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",
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl
index 24548da7..6c73c423 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl
+++ b/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"
   ]
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
deleted file mode 100644
index 4429d04a..00000000
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-postgresql/terragrunt.hcl
+++ /dev/null
@@ -1,76 +0,0 @@
-include "root" {
-  path           = find_in_parent_folders("root.hcl")
-  merge_strategy = "deep"
-  expose         = true
-}
-
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-postgresql.git?ref=main"
-  extra_arguments "retry_lock" {
-    commands  = get_terraform_commands_that_need_locking()
-    arguments = ["-lock-timeout=20s"]
-  }
-}
-
-dependencies {
-  paths = [
-    "../eks",
-    "../eks-config",
-    "../eks-dns",
-    "../eks-prometheus",
-  ]
-}
-
-dependency "eks" {
-  config_path                             = "../eks"
-  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
-  mock_outputs = {
-    cluster_name      = include.root.inputs.cluster_name
-    oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock"
-  }
-}
-
-dependency "eks_config" {
-  config_path                             = "../eks-config"
-  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
-  mock_outputs = {
-    rwo_storage_class = "gp3-mock"
-  }
-}
-
-dependency "eks_dns" {
-  config_path                             = "../eks-dns"
-  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
-  mock_outputs = {
-    cluster_domain    = "mock.example.com"
-    oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock"
-  }
-}
-
-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_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
-  namespace             = include.root.inputs.namespaces["postgresql"]
-  os_shell_tag          = include.root.inputs.os_shell_tag
-  pgpool_tag            = include.root.inputs.pgpool_tag
-  postgres_exporter_tag = include.root.inputs.postgres_exporter_tag
-  postgresql_repmgr_tag = include.root.inputs.postgresql_repmgr_tag
-  postgresql_tag        = include.root.inputs.postgresql_tag
-  service_name          = "postgresql"
-  telemetry_namespace   = include.root.inputs.telemetry_namespace
-
-  # Database Consumer Configuration
-  postgresql_database = include.root.inputs.postgresql_database
-  postgresql_username = include.root.inputs.postgresql_username
-  postgresql_password = include.root.inputs.postgresql_password
-
-}