From 95a3fe568890d195fb3a538012f98e960a62b23c Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Tue, 4 Mar 2025 16:46:57 -0500 Subject: [PATCH] wip --- lab/_envcommon/default-versions.hcl | 15 --------------- .../eks-cert-manager/terragrunt.hcl | 2 +- .../eks-grafana/terragrunt.hcl | 2 +- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl index 13931fbd..69a91e87 100644 --- a/lab/_envcommon/default-versions.hcl +++ b/lab/_envcommon/default-versions.hcl @@ -31,12 +31,8 @@ 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 @@ -114,17 +110,6 @@ 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.11" - keycloak_tag = "26.1.3" - keycloak_hostname = "keycloak" - keycloak_database = "keycloak_db" - keycloak_username = "keycloak_user" - # keycloak_password = "secure_password" - postgresql_tag = "17.4.0-debian-12-r2" - ################ # Kiali ################ diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl index 5e03cd4a..7ea7f9cc 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl @@ -5,7 +5,7 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=${include.root.inputs.release_version}" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=cicd" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl index 7830797b..08c73470 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl @@ -5,7 +5,7 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-grafana.git?ref=${include.root.inputs.release_version}" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-grafana.git?ref=namespaces" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20s"]