back to functional

SCT-Engineering · Apr 16, 2025 · 0356b68 · 0356b68
1 parent bd6d024
commit 0356b68
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 24 deletions.
diff --git a/.github/platform-tg-infra.code-workspace b/.github/platform-tg-infra.code-workspace
@@ -24,6 +24,10 @@
 			"name": "tfmod-eks-dns",
 			"path": "../../tfmod-eks-dns"
 		},
+		{
+			"name": "tfmod-ersi-arcgis",
+			"path": "../../tfmod-ersi-arcgis"
+		},
 		{
 			"name": "tfmod-gogatekeeper",
 			"path": "../../tfmod-gogatekeeper"
@@ -79,14 +83,6 @@
 		{
 			"name": "tfmod-tempo",
 			"path": "../../tfmod-tempo"
-		},
-		{
-			"name": "terraform-aws-eks",
-			"path": "../../terraform-aws-eks"
-		},
-		{
-			"name": "terragrunt",
-			"path": "../../terragrunt"
 		}
 	]
 }
diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
@@ -129,7 +129,7 @@ locals {
   # Metrics Server
   ################
   metrics_server_helm_chart = "3.12.2"
-  metrics_server_tag        = "0.7.2"
+  metrics_server_tag        = "v0.7.2"
 
   ################
   # PostgreSQL

diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-grafana/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-grafana/terragrunt.hcl
@@ -51,17 +51,6 @@ dependency "eks_prometheus" {
   }
 }
 
-dependency "eks_prometheus" {
-  config_path                             = "../eks-prometheus"
-  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
-  mock_outputs = {
-    rwo_storage_class = "gp3-mocked"
-    prometheus_server_internal_endpoint = {
-      url = "mock.prometheus.enpoint.example.com"
-    }
-  }
-}
-
 dependency "eks_tempo" {
   config_path                             = "../eks-tempo"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]

diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-keycloak/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-keycloak/terragrunt.hcl
@@ -50,10 +50,11 @@ inputs = {
   cluster_domain = dependency.eks_dns.outputs.cluster_domain
   cluster_name   = dependency.eks.outputs.cluster_name
 
-  namespace      = include.root.inputs.namespaces["keycloak"]
-  account_id     = include.root.inputs.account_id
-  profile        = include.root.inputs.aws_profile
-  region         = include.root.inputs.aws_region
+  namespace = include.root.inputs.namespaces["keycloak"]
+  # AWS Configuration
+  account_id = include.root.inputs.aws_account_id
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
 
   # keycloak config
   default_storage_class  = dependency.eks_config.outputs.rwo_storage_class