diff --git a/main.tf b/main.tf index 5281319..cbcfed3 100644 --- a/main.tf +++ b/main.tf @@ -5,13 +5,12 @@ locals { } resource "helm_release" "kiali_operator" { - depends_on = [module.images] + chart = "kiali-operator" version = var.kiali_operator_version name = "kiali-operator" namespace = var.namespace repository = "./helm-charts-2.4.0" - # repository = "https://kiali.org/helm-charts" set { name = "image.repo" @@ -74,7 +73,6 @@ resource "helm_release" "kiali_operator" { resource "helm_release" "kiali" { depends_on = [ helm_release.kiali_operator, - # module.preinstall, ] chart = "./kiali-server" @@ -97,14 +95,6 @@ resource "helm_release" "kiali" { name = "prometheus.url" value = var.prometheus_internal_url } - # set { - # name = "grafana.secretName" - # value = var.grafana_secret_name - # } - # set { - # name = "grafana.passwordKey" - # value = local.grafana_password_key - # } set { name = "grafana.externalUrl" value = var.grafana_public_url @@ -122,14 +112,3 @@ resource "helm_release" "kiali" { value = var.tempo_datasource_id } } - -# module "ingress_resources" { -# depends_on = [helm_release.kiali_operator] -# # tflint-ignore: terraform_module_pinned_source -# source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio-service-ingress.git?ref=main" -# public_hostname = var.service_name -# public_domain = var.cluster_domain -# service_name = var.service_name -# service_namespace = var.namespace -# service_port = local.internal_port_number -# } diff --git a/variables.tf b/variables.tf index ed8b0af..2168d18 100644 --- a/variables.tf +++ b/variables.tf @@ -56,17 +56,6 @@ variable "tempo_datasource_id" { 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" -# type = string -# default = "kiali" -# } - # helm repo add kiali https://kiali.org/helm-charts # helm search repo kiali/kiali-operator variable "kiali_operator_version" {