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/08/05 09:50:41 UTC
[incubator-dlab] branch DLAB-terraform updated: fixed issue with
keycloak configuration
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 bf3cd2b fixed issue with keycloak configuration
new b6eb425 Merge remote-tracking branch 'origin/DLAB-terraform' into DLAB-terraform
bf3cd2b is described below
commit bf3cd2b8610fc72d682ccb25513b910698862084
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Mon Aug 5 12:50:24 2019 +0300
fixed issue with keycloak configuration
---
.../ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ui-conf.yaml | 2 +-
.../aws/ssn-helm-charts/main/dlab-ui-chart/templates/deployment.yaml | 2 ++
.../terraform/aws/ssn-helm-charts/main/dlab-ui-chart/values.yaml | 2 ++
.../terraform/aws/ssn-helm-charts/main/files/configure_keycloak.sh | 2 +-
4 files changed, 6 insertions(+), 2 deletions(-)
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 bb84ba5..3049d69 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
@@ -230,7 +230,7 @@ data:
keycloakConfiguration:
realm: dlab
bearer-only: true
- auth-server-url: http://keycloak-http/auth
+ auth-server-url: ${KEYCLOAK_AUTH_URL}
ssl-required: none
register-node-at-startup: true
register-node-period: 600
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/deployment.yaml b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/deployment.yaml
index bd6deec..8bc7267 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/deployment.yaml
+++ b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/deployment.yaml
@@ -65,6 +65,8 @@ spec:
key: client_secret
- name: SSN_BUCKET_NAME
value: {{ .Values.bucketName }}
+ - name: KEYCLOAK_AUTH_URL
+ value: {{ .Values.dlab_ui.keycloak.auth_server_url }}
ports:
# - name: https
# containerPort: 443
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 9467ea3..e3ce22d 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,3 +57,5 @@ dlab_ui:
db_name: ${mongo_db_name}
provisionService:
host: ${provision_service_host}
+ keycloak:
+ auth_server_url: http://${ssn_k8s_alb_dns_name}/auth
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/files/configure_keycloak.sh b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/files/configure_keycloak.sh
index 069a229..e0b072a 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/files/configure_keycloak.sh
+++ b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/files/configure_keycloak.sh
@@ -39,7 +39,7 @@
-s providerType=org.keycloak.storage.UserStorageProvider -s parentId=$dlab_realm_id -s 'config.priority=["1"]' \
-s 'config.fullSyncPeriod=["-1"]' -s 'config.changedSyncPeriod=["-1"]' -s 'config.cachePolicy=["DEFAULT"]' \
-s config.evictionDay=[] -s config.evictionHour=[] -s config.evictionMinute=[] -s config.maxLifespan=[] -s \
- 'config.batchSizeForSync=["1000"]' -s 'config.editMode=["WRITABLE"]' -s 'config.syncRegistrations=["false"]' \
+ 'config.batchSizeForSync=["1000"]' -s 'config.editMode=["READ_ONLY"]' -s 'config.syncRegistrations=["false"]' \
-s 'config.vendor=["other"]' -s 'config.usernameLDAPAttribute=["${ldap_usernameAttr}"]' \
-s 'config.rdnLDAPAttribute=["${ldap_rdnAttr}"]' -s 'config.uuidLDAPAttribute=["${ldap_uuidAttr}"]' \
-s 'config.userObjectClasses=["inetOrgPerson, organizationalPerson"]' \
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org