update versions after merges

SCT-Engineering · Apr 29, 2025 · 6601f93 · 6601f93
1 parent 14d21ae
commit 6601f93
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 10 deletions.
diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
@@ -19,7 +19,7 @@ locals {
       "eks-config"         = "1.0.4"
       "eks-cribl"          = "initial"
       "eks-dns"            = "0.1.3"
-      "eks-gatekeeper"     = "mcmCluster"
+      "eks-gatekeeper"     = "0.0.2"
       "eks-grafana"        = "0.1.4"
       "eks-istio"          = "1.0.6"
       "eks-k8s-dashboard"  = "0.1.3"
@@ -54,7 +54,7 @@ locals {
   # Optional modules with their default enablement state
   enabled_modules = {
     "eks-arcgis"        = false
-    "eks-cribl"         = false
+    "eks-cribl"         = true
     "eks-gatekeeper"    = true
     "eks-grafana"       = true
     "eks-k8s-dashboard" = true

diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-cribl/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-cribl/terragrunt.hcl
@@ -40,10 +40,28 @@ dependency "eks" {
   }
 }
 
+dependency "eks_config" {
+  config_path                             = "../eks-config"
+  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
+  mock_outputs = {
+    rwo_storage_class = "gp3-mock"
+  }
+}
+
+dependency "eks_dns" {
+  config_path                             = "../eks-dns"
+  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
+  mock_outputs = {
+    cluster_domain = "mock.example.com"
+  }
+}
+
 dependencies {
   paths = [
     "../eks",
-    "../eks-gatekeeper"
+    "../eks-config",
+    "../eks-dns",
+    "../eks-gatekeeper",
   ]
 }
 
@@ -54,19 +72,19 @@ inputs = {
   region     = include.root.inputs.aws_region
 
   # Core Cluster Configuration
+  cluster_domain                                  = dependency.eks_dns.outputs.cluster_domain
   cluster_name                                    = dependency.eks.outputs.cluster_name
   eks_managed_node_groups_autoscaling_group_names = dependency.eks.outputs.eks_managed_node_groups_autoscaling_group_names
   oidc_provider_arn                               = dependency.eks.outputs.oidc_provider_arn
+  operators_ns                                    = include.root.inputs.operator_namespace
+  rwo_storage_class                               = dependency.eks_config.outputs.rwo_storage_class
   security_group_all_worker_mgmt_id               = dependency.eks.outputs.security_group_all_worker_mgmt_id
   subnets                                         = dependency.eks.outputs.subnets
-  vpc_id                                          = dependency.eks.outputs.vpc_id
-  operators_ns                                    = include.root.inputs.operator_namespace
   telemetry_ns                                    = include.root.inputs.telemetry_namespace
+  vpc_id                                          = dependency.eks.outputs.vpc_id
 
   # Cribl configs
-  cribl_tag = include.root.inputs.cribl_app_version
-  namespace = include.root.inputs.namespaces["cribl"]
-
-
-
+  cribl_tag    = include.root.inputs.cribl_app_version
+  namespace    = include.root.inputs.namespaces["cribl"]
+  service_name = "cribl-leader"
 }