You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/09/23 13:05:33 UTC
[incubator-dlab] branch DLAB-terraform updated: added additional
parameter to DLab UI service;
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-terraform by this push:
new 972f890 added additional parameter to DLab UI service;
new be5243a Merge remote-tracking branch 'origin/DLAB-terraform' into DLAB-terraform
972f890 is described below
commit 972f890bef23da58a5e3e87111c9169f19f1c198
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Mon Sep 23 16:05:16 2019 +0300
added additional parameter to DLab UI service;
---
.../ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ui-conf.yaml | 1 +
.../terraform/aws/ssn-helm-charts/main/dlab-ui-chart/values.yaml | 1 +
.../modules/helm_charts/dlab-ui-chart/templates/configmap-ui-conf.yaml | 1 +
.../gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml | 1 +
4 files changed, 4 insertions(+)
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ui-conf.yaml b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ui-conf.yaml
index fd5138a..b73696c 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ui-conf.yaml
+++ b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ui-conf.yaml
@@ -225,6 +225,7 @@ data:
username: dlab-user
keycloakConfiguration:
+ redirectUri: {{ .Values.ui.keycloak.redirect_uri }}
realm: dlab
bearer-only: true
auth-server-url: ${KEYCLOAK_AUTH_URL}
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/values.yaml b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/values.yaml
index 25e177e..06f274b 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/values.yaml
+++ b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/values.yaml
@@ -57,6 +57,7 @@ ui:
host: ${provision_service_host}
keycloak:
auth_server_url: http://${ssn_k8s_alb_dns_name}/auth
+ redirect_uri: http://${ssn_k8s_alb_dns_name}/
cloud_properties:
env_os: ${env_os}
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/configmap-ui-conf.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/configmap-ui-conf.yaml
index 4b05d5c..0937baa 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/configmap-ui-conf.yaml
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/configmap-ui-conf.yaml
@@ -227,6 +227,7 @@ data:
username: dlab-user
keycloakConfiguration:
+ redirectUri: {{ .Values.ui.keycloak.redirect_uri }}
realm: dlab
bearer-only: true
auth-server-url: ${KEYCLOAK_AUTH_URL}
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml
index 4bb1eb4..3a5e842 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml
@@ -58,3 +58,4 @@ ui:
host: ${provision_service_host}
keycloak:
auth_server_url: http://${ssn_k8s_alb_dns_name}/auth
+ redirect_uri: http://${ssn_k8s_alb_dns_name}/
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org