updates

SCT-Engineering · Mar 13, 2025 · b7f3e42 · b7f3e42
1 parent a0c2257
commit b7f3e42
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/.github/platform-tg-infra.code-workspace b/.github/platform-tg-infra.code-workspace
@@ -79,6 +79,9 @@
 		{
 			"name": "terragrunt",
 			"path": "../../terragrunt"
+		},
+		{
+			"path": "../../tfmod-config-job"
 		}
 	]
 }
diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
@@ -24,8 +24,8 @@ locals {
   #####################
   # Namespaces Config
   #####################
-  operator_namespace  = "operator"
-  telemetry_namespace = "telemetry"
+  operator_namespace  = "aoperator"
+  telemetry_namespace = "atelemetry"
   namespaces = {
     cert-manager   = "kube-system"
     karpenter      = "karpenter"
@@ -98,8 +98,8 @@ locals {
   keycloak_chart_version = "24.4.11"
   keycloak_tag           = "26.1.3"
   keycloak_hostname      = "keycloak"
-  keycloak_database      = "bitnami_keycloak"
-  keycloak_username      = "bn_keycloak"
+  keycloak_database      = "keycloak"
+  keycloak_username      = "keycloak"
   keycloak_password      = "this is my very secure and totally random password horse battery staple now"
   postgresql_tag         = "17.4.0-debian-12-r2"
 

diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-gogatekeeper/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-gogatekeeper/terragrunt.hcl
@@ -42,6 +42,9 @@ dependency "eks_keycloak" {
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
     public_endpoint = "mock.keycloak.example.com"
+    discovery_url   = "mock.keycloak.example.com/auth"
+    client_id       = "mock-client-id"
+    client_secret   = "mock-client-secret"
   }
 }
 
@@ -65,11 +68,13 @@ inputs = {
   # Gatekeeper Config
   gogatekeeper_tag           = include.root.inputs.gogatekeeper_tag
   gogatekeeper_chart_version = include.root.inputs.gogatekeeper_chart_version
-  keycloak_public_url        = dependency.eks_keycloak.outputs.public_endpoint
+  keycloak_discovery_url     = dependency.eks_keycloak.outputs.discovery_url
 
   # Service Behind Gatekeeper Config
-  service_name    = "test-gc"
-  redirection_url = dependency.eks_grafana.outputs.public_endpoint
-  client_id = dependency.eks_keycloak.outputs.client_id
-  client_secret = dependency.eks_keycloak.outputs.client_secret
+  service_name        = "test-gc"
+  upstream_url        = dependency.eks_grafana.outputs.public_endpoint
+  redirection_url     = dependency.eks_grafana.outputs.public_endpoint
+  client_id           = dependency.eks_keycloak.outputs.client_id
+  client_secret       = dependency.eks_keycloak.outputs.client_secret
+  keycloak_public_url = dependency.eks_keycloak.outputs.public_endpoint
 }
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
@@ -47,7 +47,6 @@ dependencies {
 }
 
 inputs = {
-  admin_email    = include.root.inputs.cluster_mailing_list
   cluster_domain = dependency.eks_dns.outputs.cluster_domain
   cluster_name   = dependency.eks.outputs.cluster_name
   namespace      = include.root.inputs.namespaces["keycloak"]
@@ -59,6 +58,10 @@ inputs = {
   keycloak_chart_version = include.root.inputs.keycloak_chart_version
   keycloak_hostname      = include.root.inputs.keycloak_hostname
   keycloak_tag           = include.root.inputs.keycloak_tag
+  realm_email            = include.root.inputs.cluster_mailing_list
+  realm_name             = "master"
+  realm_password         = include.root.inputs.keycloak_password
+  realm_username         = include.root.inputs.keycloak_username
   service_name           = "keycloak"
   telemetry_namespace    = include.root.inputs.telemetry_namespace