From 9340e57c9233173e16902eb77822d14bbd404dc9 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Thu, 27 Feb 2025 17:25:18 -0500 Subject: [PATCH] no jaeger --- README.md | 1 - main.tf | 9 ++++----- variables.tf | 13 ++++--------- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 3e110ee..0cac009 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,6 @@ | [grafana\_public\_url](#input\_grafana\_public\_url) | The URL incoming traffic from outisde the cluster uses to access grafana. | `string` | n/a | yes | | [grafana\_secret\_name](#input\_grafana\_secret\_name) | The secret in the holding the grafana admin password. | `string` | n/a | yes | | [istio\_namespace](#input\_istio\_namespace) | The namespace where istio has been deployed. | `string` | `"istio-system"` | no | -| [jaeger\_internal\_url](#input\_jaeger\_internal\_url) | The url within the cluster to use to query the jaegertracing. | `string` | n/a | yes | | [kiali\_application\_version](#input\_kiali\_application\_version) | The version of kiali to install | `string` | `"v1.73.0"` | no | | [kiali\_operator\_version](#input\_kiali\_operator\_version) | The version of kiali to install | `string` | `"1.73.0"` | no | | [namespace](#input\_namespace) | The namespace to create and into which the tools are deployed. | `string` | `"namespace"` | no | diff --git a/main.tf b/main.tf index 5b1e7c2..08905e5 100644 --- a/main.tf +++ b/main.tf @@ -25,7 +25,6 @@ resource "kubernetes_secret" "kiali_grafana" { } } - # data "kubernetes_namespace" "keycloak" { # count = local.have_keycloak ? 1 : 0 @@ -87,10 +86,10 @@ resource "helm_release" "kiali_operator" { name = "prometheus.url" value = var.prometheus_internal_url } - set { - name = "grafana.secretName" - value = local.grafana_secret_name - } + # set { + # name = "jaegerInClusterUrl" + # value = var.jaeger_internal_url + # } set { name = "grafana.passwordKey" value = local.grafana_password_key diff --git a/variables.tf b/variables.tf index a22772b..d7f6408 100644 --- a/variables.tf +++ b/variables.tf @@ -51,15 +51,10 @@ variable "prometheus_internal_url" { type = string } -variable "tempo_internal_url" { - description = "The url within the cluster to use to query tempo tracing." - type = string -} - -variable "tempo_datasource_id" { - description = "The UID of the created Tempo datasource" - type = string -} +# variable "jaeger_internal_url" { +# description = "The url within the cluster to use to query the jaegertracing." +# type = string +# } # variable "public_hostname" { # description = "The hostname to use for kiali that will be publicly available"