Skip to content

Commit

Permalink
from dmz git
Browse files Browse the repository at this point in the history
  • Loading branch information
morga471 committed Aug 13, 2024
1 parent a052a06 commit 2823583
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
# tfmod-istio-tools
# tfmod-kiali

<!-- BEGIN_TF_DOCS -->
<!-- END_TF_DOCS -->
13 changes: 4 additions & 9 deletions main.tf
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -135,7 +131,6 @@ resource "helm_release" "kiali" {
name = "publicDomain"
value = var.cluster_domain
}

set {
name = "istioNamespace"
value = var.istio_namespace
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 2823583

Please sign in to comment.