diff --git a/main.tf b/main.tf index bc98c39..a03c320 100644 --- a/main.tf +++ b/main.tf @@ -1,11 +1,7 @@ - locals { - internal_hostname = format("%v.%v.svc.cluster.local", var.service_name, var.namespace) internal_port_number = "20001" internal_url = format("https://%s:%s/", local.internal_hostname, local.internal_port_number) - - public_domain = var.cluster_domain } # data "kubernetes_secret" "grafana_admin" { @@ -56,7 +52,7 @@ resource "helm_release" "kiali_operator" { } set { name = "publicDomain" - value = local.public_domain + value = var.cluster_domain } set { name = "istioNamespace" @@ -125,36 +121,12 @@ resource "helm_release" "kiali_operator" { # } } -# module "kiali_ingress" { -# depends_on = [helm_release.kiali] - -# #source = "git@github.it.census.gov:SOA/tfmod-gogatekeeper.git//>ref=1.0.0" -# source = "git@github.it.census.gov:SOA/tfmod-gogatekeeper.git//" - -# certificate_issuer = var.certificate_issuer - -# namespace = local.ns -# application_name = "kiali" -# public_hostname = "kiali" -# cluster_domain = var.cluster_domain -# upstream_hostname = local.internal_hostname -# upstream_port = local.internal_port_number -# redirection_url = local.public_url -# client_id = var.sso_client_id -# client_secret = var.sso_client_secret -# keycloak_public_url = var.keycloak_public_url -# gogatekeeper_chart_version = var.gogatekeeper_chart_version -# gogatekeeper_registry = var.gogatekeeper_registry -# gogatekeeper_repository = var.gogatekeeper_repository -# gogatekeeper_tag = var.gogatekeeper_tag -# } - 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 = local.public_domain + public_domain = var.cluster_domain service_name = var.service_name service_namespace = var.namespace service_port = local.internal_port_number