This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a commit to branch DLAB-1086 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1086 by this push: new 71bd9b5 fixed issue with Load Balancer IP 71bd9b5 is described below commit 71bd9b578c3a14e9e40fe2fd30bd357cf2ffe185 Author: Oleh Martushevskyi <oleh_martushevs...@epam.com> AuthorDate: Thu Sep 12 17:20:37 2019 +0300 fixed issue with Load Balancer IP --- .../terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf | 2 +- .../terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf | 4 ++-- .../terraform/gcp/ssn-gke/main/modules/helm_charts/nginx.tf | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf index e776fb4..43d3d19 100644 --- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf +++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf @@ -26,7 +26,7 @@ data "template_file" "dlab_ui_values" { mongo_user = var.mongo_db_username mongo_port = var.mongo_service_port mongo_service_name = var.mongo_service_name - ssn_k8s_alb_dns_name = var.ssn_k8s_alb_dns_name + ssn_k8s_alb_dns_name = data.kubernetes_service.nginx_service.load_balancer_ingress.0.ip provision_service_host = "127.0.0.1" # var.endpoint_eip_address env_os = var.env_os service_base_name = var.service_base_name diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf index e92f2f7..2398b13 100644 --- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf +++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf @@ -22,7 +22,7 @@ data "template_file" "configure_keycloak" { template = file("./modules/helm_charts/files/configure_keycloak.sh") vars = { - ssn_k8s_alb_dns_name = var.ssn_k8s_alb_dns_name + ssn_k8s_alb_dns_name = data.kubernetes_service.nginx_service.load_balancer_ingress.0.ip keycloak_user = var.keycloak_user keycloak_password = random_string.keycloak_password.result keycloak_client_secret = random_uuid.keycloak_client_secret.result @@ -42,7 +42,7 @@ data "template_file" "keycloak_values" { vars = { keycloak_user = var.keycloak_user keycloak_password = random_string.keycloak_password.result - ssn_k8s_alb_dns_name = var.ssn_k8s_alb_dns_name + ssn_k8s_alb_dns_name = data.kubernetes_service.nginx_service.load_balancer_ingress.0.ip configure_keycloak_file = data.template_file.configure_keycloak.rendered mysql_db_name = var.mysql_db_name mysql_user = var.mysql_user diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/nginx.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/nginx.tf index 1ce1413..dec98ea 100644 --- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/nginx.tf +++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/nginx.tf @@ -28,3 +28,10 @@ resource "helm_release" "nginx" { file("./modules/helm_charts/files/nginx_values.yaml") ] } + +data "kubernetes_service" "nginx_service" { + metadata { + name = "${helm_release.nginx.name}-controller" + } + depends_on = [helm_release.nginx] +} \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org