diff --git a/README.md b/README.md index f521b08..b77f977 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ -# tfmod-istio-tools # tfmod-kiali + + + diff --git a/main.tf b/main.tf index 07949f3..239e882 100644 --- a/main.tf +++ b/main.tf @@ -1,5 +1,6 @@ locals { + ns = try(kubernetes_namespace.ns[0].metadata[0].name, data.kubernetes_namespace.existing-ns[0].metadata[0].name) public_hostname = format("kiali.%v", var.cluster_domain) public_port_number = "80" public_url = format("https://%v:%v/", local.public_hostname, local.public_port_number) @@ -57,11 +58,6 @@ data "kubernetes_namespace" "existing-ns" { } } -locals { - ns = try(kubernetes_namespace.ns[0].metadata[0].name, data.kubernetes_namespace.existing-ns[0].metadata[0].name) -} - - data "kubernetes_namespace" "keycloak" { count = local.have_keycloak ? 1 : 0 @@ -71,13 +67,13 @@ data "kubernetes_namespace" "keycloak" { } module "service_account" { - source = "git@github.it.census.gov:SCT-Engineering/tfmod-config-job.git//service-account" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-config-job.git//service-account" namespace = local.ns } module "preinstall" { - source = "git@github.it.census.gov:SCT-Engineering/tfmod-config-job.git//config-job" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-config-job.git//config-job" namespace = local.ns service_account_name = module.service_account.service_account_name @@ -135,7 +131,6 @@ resource "helm_release" "kiali" { name = "publicDomain" value = var.cluster_domain } - set { name = "istioNamespace" value = var.istio_namespace @@ -209,7 +204,7 @@ resource "helm_release" "kiali" { module "kiali_ingress" { depends_on = [helm_release.kiali] - source = "git@github.it.census.gov:SCT-Engineering/tfmod-gogatekeeper.git//" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-gogatekeeper.git//" certificate_issuer = var.certificate_issuer