You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by my...@apache.org on 2020/11/17 07:28:25 UTC
[incubator-datalab] branch DATALAB-2102 updated: [DLAB-2102]:
billing test
This is an automated email from the ASF dual-hosted git repository.
mykolabodnar pushed a commit to branch DATALAB-2102
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-2102 by this push:
new 0b2a327 [DLAB-2102]: billing test
0b2a327 is described below
commit 0b2a327a42089902ece7ce30b4711bee0edd3546
Author: bodnarmykola <bo...@gmail.com>
AuthorDate: Tue Nov 17 09:24:41 2020 +0200
[DLAB-2102]: billing test
---
.../datalab-billing-chart/templates/configmap-billing-conf.yaml | 4 ++--
.../main/modules/helm_charts/datalab-billing-chart/values.yaml | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-billing-chart/templates/configmap-billing-conf.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-billing-chart/templates/configmap-billing-conf.yaml
index bc19c0d..1eba06a 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-billing-chart/templates/configmap-billing-conf.yaml
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-billing-chart/templates/configmap-billing-conf.yaml
@@ -60,8 +60,8 @@ data:
keycloak:
bearer-only: true
- realm: {{ .Values.ui.keycloak.realm_name }}
- resource: {{ .Values.ui.keycloak.client_id }}
+ realm: {{ .Values.billing.keycloak.realm_name }}
+ resource: {{ .Values.billing.keycloak.client_id }}
credentials.secret: ${KEYCLOAK_CLIENT_SECRET}
ssl-required: none
auth-server-url: ${KEYCLOAK_AUTH_URL}
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-billing-chart/values.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-billing-chart/values.yaml
index bc2555f..86f3956 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-billing-chart/values.yaml
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-billing-chart/values.yaml
@@ -59,5 +59,10 @@ billing:
port: ${mongo_port}
username: ${mongo_user}
db_name: ${mongo_db_name}
+ keycloak:
+ auth_server_url: https://${ssn_k8s_alb_dns_name}/auth
+ redirect_uri: https://${ssn_k8s_alb_dns_name}/
+ realm_name: ${keycloak_realm_name}
+ client_id: ${keycloak_client_id}
service_base_name: ${service_base_name}
big_query_dataset: ${big_query_dataset}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org