more updates

lab/_envcommon/default-versions.hcl

@@ -48,7 +48,7 @@ locals {
   # Istio
   ################
   istio_namespace = "istio-system"
-  istio_version = "1.24.2"
+  istio_version   = "1.24.2"
 
   ################
   # Grafana

lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl

@@ -12,7 +12,7 @@ dependencies {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=${include.root.inputs.release_version}"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=outputs"
 
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()

lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl

@@ -21,11 +21,11 @@ dependency "eks" {
   }
 }
 
-dependency "eks-loki" {
+dependency "eks_loki" {
   config_path                             = "../eks-loki"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
-    rwo_storage_class = "gp3-encrypted"
+    rwo_storage_class = "gp3-mocked"
   }
 }
 
@@ -34,7 +34,8 @@ dependencies {
     "../eks",
     "../eks-config",
     "../eks-dns",
-    "../eks-karpenter"
+    "../eks-karpenter",
+    "../eks-loki"
   ]
 }
 
@@ -48,14 +49,16 @@ inputs = {
   cluster_name      = dependency.eks.outputs.cluster_name
   cluster_domain    = include.root.inputs.vpc_domain_name
   oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn
-  public_hostname   = include.root.inputs.grafana_hostname
 
   # Storage Configuration
-  rwo_storage_class = dependency.eks-loki.outputs.rwo_storage_class
+  rwo_storage_class = dependency.eks_loki.outputs.rwo_storage_class
 
   # Grafana Configuration
   grafana_chart_version         = include.root.inputs.grafana_chart_version
   grafana_tag                   = include.root.inputs.grafana_tag
   download_dashboards_image_tag = include.root.inputs.download_dashboards_image_tag
   init_chown_data_image_tag     = include.root.inputs.init_chown_data_image_tag
+  namespace                     = include.root.inputs.grafana_namespace
+  public_hostname               = include.root.inputs.grafana_hostname
 }
+

lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl → lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl.disabled

@@ -8,7 +8,7 @@ terraform {
   source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
-    arguments = ["-lock-timeout=20m"]
+    arguments = ["-lock-timeout=20s"]
   }
 }
 
@@ -18,7 +18,8 @@ dependencies {
     "../eks-config",
     "../eks-dns",
     "../eks-grafana",
-    "../eks-istio"
+    "../eks-istio",
+    "../eks-prometheus"
   ]
 }
 
@@ -31,7 +32,15 @@ dependency "eks" {
   }
 }
 
-dependency "eks-dns" {
+dependency "eks-config" {
+  config_path                             = "../eks-config"
+  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
+  mock_outputs = {
+    operators_namespace = "mock-namespace"
+  }
+}
+
+dependency "eks_dns" {
   config_path                             = "../eks-dns"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
@@ -40,36 +49,60 @@ dependency "eks-dns" {
   }
 }
 
-dependency "eks-grafana" {
+dependency "eks_grafana" {
   config_path                             = "../eks-grafana"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
-    internal_endpoint = { url = "mock.internal.example.com" }
-    namespace         = "mock-namespace-grafana"
+    internal_endpoint = {
+      hostname    = "grafana.mock.svc.cluster.local"
+      port_number = "80"
+      url         = "https://grafana.mock.svc.cluster.local:80/"
+    }
+    namespace         = "grafana"
+    public_endpoint   = {
+      hostname    = "grafana.mock.lab.csp2.census.gov"
+      port_number = "80"
+      url         = "https://grafana.mock.lab.csp2.census.gov:80/"
+    }
+    secret_name       = "grafana"
   }
 }
 
-dependency "eks-istio" {
+dependency "eks_istio" {
   config_path                             = "../eks-istio"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
     namespace = "mock-namespace-istio"
   }
 }
 
+dependency "eks_prometheus" {
+  config_path                             = "../eks-prometheus"
+  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
+  mock_outputs = {
+    prometheus_internal_url = "mock-internal-url"
+  }
+}
+
 inputs = {
   # AWS Configuration
   account_id = include.root.inputs.aws_account_id
   profile    = include.root.inputs.aws_profile
   region     = include.root.inputs.aws_region
 
   # Cluster Configuration
-  cluster_domain = dependency.eks-dns.outputs.cluster_domain
+  cluster_domain = dependency.eks_dns.outputs.cluster_domain
   cluster_name   = dependency.eks.outputs.cluster_name
 
   # Kiali Configuration
-  grafana_internal_url   = dependency.eks-grafana.outputs.internal_endpoint.url
-  grafana_namespace      = dependency.eks-grafana.outputs.namespace
-  istio_namespace        = dependency.eks-istio.outputs.namepsace
+  grafana_internal_url = dependency.eks_grafana.outputs.internal_endpoint.url
+  grafana_namespace    = dependency.eks_grafana.outputs.namespace
+  grafana_secret_name  = dependency.eks_grafana.outputs.secret_name
+  grafana_public_url   = dependency.eks_grafana.outputs.public_endpoint.url
+
   kiali_operator_version = include.root.inputs.kiali_operator_version
+  operators_namespace    = dependency.eks-config.outputs.operators_namespace
+
+  prometheus_internal_url = dependency.eks_prometheus.outputs.internal_endpoint
+  jager_internal_url      = dependency.eks_prometheus.outputs.jager_internal_url
 }