From 4fb1d826c3242df572fa55479fec71efaf6f9be0 Mon Sep 17 00:00:00 2001 From: mcgin314 Date: Wed, 12 Mar 2025 10:57:20 -0400 Subject: [PATCH] Fix operator reference --- .../platform-test-z/eks-kiali/terragrunt.hcl | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-kiali/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-kiali/terragrunt.hcl index a2e2a0e..040fd99 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-kiali/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-kiali/terragrunt.hcl @@ -54,34 +54,32 @@ dependency "eks-grafana" { url = "https://grafana.grafana.svc.cluster.local:80/" } namespace = "grafana" - public_endpoint = { - hostname = "grafana.dev.lab.csp2.census.gov" - port_number = "80" - url = "https://grafana.dev.lab.csp2.census.gov:80/" - } + public_endpoint = "https://grafana.dev.lab.csp2.census.gov:80/" secret_name = "grafana" + tempo_datasource_id = "tempo" } } inputs = { profile = include.root.inputs.aws_profile cluster_domain = dependency.eks.inputs.vpc_domain_name - operators_namespace = "operators" cluster_name = dependency.eks.outputs.cluster_name certificate_issuer = dependency.eks-cert-manager.outputs.cluster_issuer_name - # istio_namespace = + kiali_operator_version = include.root.inputs.kiali_operator_version + kiali_application_version = include.root.inputs.kiali_application_version + + namespace = include.root.inputs.namespaces["kiali"] + istio_namespace = include.root.inputs.namespaces["istio"] prometheus_internal_url = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.url grafana_namespace = dependency.eks-grafana.outputs.namespace - grafana_secret_name = "grafana" + grafana_secret_name = dependency.eks-grafana.outputs.secret_name grafana_internal_url = dependency.eks-grafana.outputs.internal_endpoint.url - - grafana_public_url = dependency.eks-grafana.outputs.public_endpoint.url - - # grafana_secret_name = dependency.eks-grafana.outputs.secret_name - tempo_internal_url = dependency.eks-tempo.outputs.tempo_internal_endpoint.url - namespace = include.root.inputs.namespaces["kiali"] + grafana_public_url = dependency.eks-grafana.outputs.public_endpoint + tempo_datasource_id = dependency.eks-grafana.outputs.tempo_datasource_id + tempo_internal_url = dependency.eks-tempo.outputs.tempo_internal_endpoint.url + # client_id = var.sso_client_id