Skip to content

Commit

Permalink
Split endpoint information into parts.
Browse files Browse the repository at this point in the history
  • Loading branch information
zawac002 committed Sep 15, 2023
1 parent 5ca5abe commit 3e9e649
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 8 deletions.
16 changes: 12 additions & 4 deletions main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@

locals {
kiali_public_url = format("https://kiali.%v/", var.cluster_domain)
kiali_internal_url = format("http://kiali.%v.svc.cluster.local:20001/", var.namespace)
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)

internal_hostname = format("kiali.%v.svc.cluster.local", var.namespace)
internal_port_number = "20001"
internal_url = format("http://%v:%v/", local.internal_hostname, local.internal_port_number)

have_keycloak = (
try(length(var.keycloak_namespace), 0) > 0 &&
Expand Down Expand Up @@ -211,8 +216,11 @@ module "kiali_ingress" {

namespace = local.ns
application_name = "kiali"
upstream_url = local.kiali_internal_url
redirection_url = local.kiali_public_url
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
Expand Down
16 changes: 12 additions & 4 deletions outputs.tf
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@

output "public_url" {
value = local.kiali_public_url
output "public" {
value = {
hostname = local.public_hostname
port_number = local.public_port_number
url = local.public_url
}
}

output "internal_url" {
value = local.kiali_internal_url
output "internal" {
value = {
hostname = local.internal_hostname
port_number = local.internal_port_number
url = local.internal_url
}
}

0 comments on commit 3e9e649

Please sign in to comment.