tempo and kiali updates while working on keycloak

SCT-Engineering · Mar 13, 2025 · a6cb4f7 · a6cb4f7
1 parent 5923146
commit a6cb4f7
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 23 deletions.
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-keycloak/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-keycloak/terragrunt.hcl
@@ -32,7 +32,7 @@ dependencies {
 }
 
 inputs = {
-  admin_email         = include.root.inputs.creator
+  admin_email         = include.root.inputs.cluster_mailing_list
   cluster_domain      = include.root.inputs.vpc_domain_name
   cluster_name        = dependency.eks.outputs.cluster_name
   environment         = include.root.inputs.environment

diff --git a/...-eks-mcm/eks-kiali/terragrunt.hcl.disable → ...form-eng-eks-mcm/eks-kiali/terragrunt.hcl b/...-eks-mcm/eks-kiali/terragrunt.hcl.disable → ...form-eng-eks-mcm/eks-kiali/terragrunt.hcl
@@ -4,17 +4,31 @@ include "root" {
   expose         = true
 }
 
+dependencies {
+  paths = [
+    "../eks",
+    "../eks-cert-mgr"
+    "../eks-config",
+    "../eks-dns",
+    "../eks-istio",
+    "../eks-karpenter",
+    "../eks-prometheus",
+    "../eks-grafana",
+    "../eks-k8s-dashboard"
+  ]
+}
+
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git?ref=${include.root.inputs.release_version}"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git?ref=mcmCluster"
   # source = "../../../../../../../tfmod-kiali"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
-    arguments = ["-lock-timeout=20m"]
+    arguments = ["-lock-timeout=20s"]
   }
 }
 
 dependency "eks" {
-  config_path = "../eks"
+  config_path                             = "../eks"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
     cluster_name = "a-cluster-name"
@@ -23,42 +37,41 @@ dependency "eks" {
 
 dependency "eks-cert-manager" {
   config_path = "../eks-cert-manager"
+  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
-    cluster_issuer_name = "acmpca-clusterissuer"
+    cluster_issuer_name = "mock-clusterissuer"
   }
 }
 
 dependency "eks-prometheus" {
   config_path = "../eks-prometheus"
+  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
     prometheus_server_internal_endpoint = {
-      hostname    = "prometheus-server.prometheus.svc.cluster.local"
+      hostname    = "prometheus.mock.svc.cluster.local"
       port_number = 9090
-      url         = "http://prometheus-server.prometheus.svc.cluster.local:9090/"
+      url         = "http://prometheus.mock.svc.cluster.local:9090/"
     }
   }
-
 }
+
 dependency "eks-grafana" {
   config_path = "../eks-grafana"
   mock_outputs = {
     internal_endpoint = {
-      hostname    = "grafana.grafana.svc.cluster.local"
-      port_number = "80"
-      url         = "https://grafana.grafana.svc.cluster.local:80/"
-    }
-    namespace         = "grafana"
-    public_endpoint   = {
-      hostname    = "grafana.dev.lab.csp2.census.gov"
+      hostname    = "grafana.mock.svc.cluster.local"
       port_number = "80"
-      url         = "https://grafana.dev.lab.csp2.census.gov:80/"
+      url         = "https://grafana.mock.svc.cluster.local:80/"
     }
-    secret_name       = "grafana"
+    namespace        = "mock"
+    public_endpoint  = "https://grafana.mock.mock.mock.census.gov:80/"
+    secret_name      = "mock"
   }
 }
 
+
 inputs = {
-  kiali_operator_version = include.root.inputs.kiali_operator_version
+  kiali_operator_version    = include.root.inputs.kiali_operator_version
   kiali_application_version = include.root.inputs.kiali_application_version
 
   profile                 = include.root.inputs.aws_profile
@@ -69,10 +82,10 @@ inputs = {
   prometheus_internal_url = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.url
   grafana_internal_url    = dependency.eks-grafana.outputs.internal_endpoint.url
   grafana_namespace       = dependency.eks-grafana.outputs.namespace
-  grafana_public_url      = dependency.eks-grafana.outputs.public_endpoint.url
-  grafana_secret_name     = "grafana"
-  # grafana_secret_name     = dependency.eks-grafana.outputs.secret_name
-  jaeger_internal_url     = ""
+  grafana_public_url      = dependency.eks-grafana.outputs.public_endpoint
+  # grafana_secret_name     = "grafana"
+  grafana_secret_name     = dependency.eks-grafana.outputs.secret_name
+  jaeger_internal_url = ""
 
 
   # client_id                  = var.sso_client_id

diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl
@@ -5,7 +5,7 @@ include "root" {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-tempo.git?ref=${include.root.inputs.release_version}"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-tempo.git?ref=keycloak"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20s"]