From 5ebbfd719cbcdc069a064799ff60d627663f033c Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Tue, 25 Feb 2025 22:02:20 -0500 Subject: [PATCH] docs and keycloak --- .github/platform-tg-infra.code-workspace | 1 + lab/_envcommon/default-versions.hcl | 14 ++++++++++++++ .../eks-k8s-dashboard/terragrunt.hcl | 4 ++++ 3 files changed, 19 insertions(+) diff --git a/.github/platform-tg-infra.code-workspace b/.github/platform-tg-infra.code-workspace index d243b5d4..71e7cfd9 100644 --- a/.github/platform-tg-infra.code-workspace +++ b/.github/platform-tg-infra.code-workspace @@ -81,6 +81,7 @@ "path": "../../terragrunt" }, { + "name": "tfmod-config-job", "path": "../../tfmod-config-job" } ] diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl index 478dc672..a18d6ba7 100644 --- a/lab/_envcommon/default-versions.hcl +++ b/lab/_envcommon/default-versions.hcl @@ -86,6 +86,12 @@ locals { k8s_dashboard_metrics_scraper = "1.0.8" k8s_dashboard_version = "6.0.6" + ################ + # k8s-dashboard + ################ + dashboard_hostname = "k8s-dashboard" + k8s_dashboard_version = "6.0.6" + ################ # Karpenter ################ @@ -103,6 +109,14 @@ 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_app_version = "v26.1.2" + keycloak_chart_version = "24.4.10" + keycloak_hostname = "keycloak" + keycloak_namespace = "keycloak" + ################ # Kiali ################ diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl index 1d02df66..285b53e9 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl @@ -50,5 +50,9 @@ inputs = { # Dashboard Configuration service_name = include.root.inputs.dashboard_hostname k8s_dashboard_version = include.root.inputs.k8s_dashboard_version +<<<<<<< HEAD namespace = include.root.inputs.namespaces["k8s-dashboard"] +======= + namespace = include.root.inputs.dashboard_hostname +>>>>>>> f649b29 (docs and keycloak) }