From d34b6e2b1a1de9d7666b36abd6009226262f9951 Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Thu, 27 Feb 2025 13:55:44 -0500
Subject: [PATCH] use main

---
 lab/_envcommon/default-versions.hcl | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
index ee589fb..f2be7f6 100644
--- a/lab/_envcommon/default-versions.hcl
+++ b/lab/_envcommon/default-versions.hcl
@@ -8,7 +8,7 @@ locals {
   custom_service_eks_account = "${local.release_version}"
   eks_module_version         = "20.33.1"
   istio_ingress_version      = "${local.release_version}"
-  release_version            = "0.1.1" # "main" # change to main when testing updated modules
+  release_version            = "main" # "main" # change to main when testing updated modules
 
   #####################
   # TF Providers
@@ -46,6 +46,13 @@ locals {
   telemetry_namespace = "telemetry"
   # kubectl_image_tag = "1.30.4"
 
+  ################
+  # k8s-dashboard
+  ################
+  dashboard_hostname            = "dashboard"
+  k8s_dashboard_metrics_scraper = "1.0.8"
+  k8s_dashboard_version         = "6.0.6"
+
   ################
   # Cert-Manager
   ################
@@ -73,29 +80,12 @@ locals {
   grafana_tag                   = "11.4.0"
   init_chown_data_image_tag     = "1.31.1"
 
-  ################
-  # k8s-dashboard
-  ################
-  dashboard_hostname    = "k8s-dashboard"
-  k8s_dashboard_version = "6.0.6"
-
   ################
   # Karpenter
   ################
   karpenter_helm_chart = "1.1.1"
   karpenter_tag        = "1.1.1"
 
-  ################
-  # keycloak
-  ################
-  keycloak_tag           = "26.1.2"
-  keycloak_chart_version = "24.4.10"
-  keycloak_hostname      = "keycloak"
-  keycloak_namespace     = "keycloak"
-  postgresql_tag         = "17.4.0"
-  postgres_exporter_tag  = "0.17.1"
-  os_shell_tag           = "12"
-
   ################
   # Kiali
   ################
@@ -124,7 +114,6 @@ locals {
   # Prometheus
   ################
   prometheus_chart_version       = "25.26.0"
-  prometheus_namespace           = "prometheus"
   prometheus_server_tag          = "v2.54.0"
   prometheus_config_reloader_tag = "v0.75.2"
   alertmanager_tag               = "v0.27.0"
@@ -136,6 +125,5 @@ locals {
   # Tempo
   ################
   tempo_chart_version = "1.18.1"
-  tempo_namespace     = "tempo"
   tempo_tag           = "2.7.0"
 }