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/16 08:47:31 UTC

[incubator-dlab] 01/01: Merge pull request #305 from apache/DLAB-1086

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

commit 93dd033653f60798ad2c1de329bc599891828381
Merge: 40a8679 874f070
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Mon Sep 16 11:47:24 2019 +0300

    Merge pull request #305 from apache/DLAB-1086
    
    Dlab 1086

 .../main/dlab-billing-chart/values.yaml            |   2 +-
 .../dlab-ui-chart/templates/configmap-ui-conf.yaml |   6 +
 .../ssn-helm-charts/main/dlab-ui-chart/values.yaml |   2 +-
 .../terraform/gcp/ssn-gke/main/main.tf             |  47 ++
 .../gcp/ssn-gke/main/{ => modules/gke}/gke.tf      |  38 +-
 .../gcp/ssn-gke/main/{ => modules/gke}/iam.tf      |  24 +-
 .../main/{main.tf => modules/gke/outputs.tf}       |  15 +-
 .../gcp/ssn-gke/main/modules/gke/variables.tf      |  31 +-
 .../gcp/ssn-gke/main/{ => modules/gke}/vpc.tf      |   0
 .../helm_charts/dlab-billing-chart/.helmignore     |  41 +-
 .../helm_charts/dlab-billing-chart/Chart.yaml}     |  11 +-
 .../dlab-billing-chart/templates/NOTES.txt         |  42 ++
 .../dlab-billing-chart/templates/_helpers.tpl      |  65 +++
 .../templates/configmap-billing-conf.yaml          |  45 +-
 .../dlab-billing-chart/templates/deployment.yaml   |  86 ++++
 .../dlab-billing-chart/templates/service.yaml      |  34 +-
 .../helm_charts}/dlab-billing-chart/values.yaml    |  17 +-
 .../helm_charts/dlab-billing.tf}                   |  72 +---
 .../modules/helm_charts/dlab-ui-chart/.helmignore  |  41 +-
 .../helm_charts/dlab-ui-chart/Chart.yaml}          |  11 +-
 .../helm_charts/dlab-ui-chart/templates/NOTES.txt  |  42 ++
 .../dlab-ui-chart/templates/_helpers.tpl           |  65 +++
 .../dlab-ui-chart/templates/configmap-ui-conf.yaml |  30 +-
 .../dlab-ui-chart/templates/deployment.yaml        | 101 +++++
 .../dlab-ui-chart/templates/ingress.yaml           |  43 +-
 .../dlab-ui-chart/templates/service.yaml           |  41 +-
 .../modules/helm_charts}/dlab-ui-chart/values.yaml |  13 +-
 .../ssn-gke/main/modules/helm_charts/dlab-ui.tf    |  50 +++
 .../helm_charts/files/configure_keycloak.sh        | 115 +++++
 .../files/dlab/login/resources/css/login.css       | 473 +++++++++++++++++++++
 .../files/dlab/login/resources/img/favicon.ico     | Bin 0 -> 4286 bytes
 .../resources/img/feedback-error-arrow-down.png    | Bin 0 -> 513 bytes
 .../login/resources/img/feedback-error-sign.png    | Bin 0 -> 343 bytes
 .../resources/img/feedback-success-arrow-down.png  | Bin 0 -> 678 bytes
 .../login/resources/img/feedback-success-sign.png  | Bin 0 -> 410 bytes
 .../resources/img/feedback-warning-arrow-down.png  | Bin 0 -> 513 bytes
 .../login/resources/img/feedback-warning-sign.png  | Bin 0 -> 646 bytes
 .../dlab/login/resources/img/keycloak-logo.png     | Bin 0 -> 5281 bytes
 .../dlab/login/resources/img/login-background.png  | Bin 0 -> 191866 bytes
 .../files/dlab/login/resources/img/login-icons.png | Bin 0 -> 3934 bytes
 .../files/dlab/login/resources/img/logo.png        | Bin 0 -> 5268 bytes
 .../helm_charts/files/dlab/login/theme.properties  |  69 +++
 .../modules/helm_charts/files/keycloak_values.yaml |  73 ++++
 .../helm_charts/files/mongo_values.yaml}           |  23 +-
 .../helm_charts/files/mysql_values.yaml}           |  10 +-
 .../helm_charts/files/nginx_values.yaml}           |  12 +-
 .../ssn-gke/main/modules/helm_charts/keycloak.tf   | 102 +++++
 .../gcp/ssn-gke/main/modules/helm_charts/main.tf   |  77 ++++
 .../{variables.tf => modules/helm_charts/mongo.tf} |  74 +---
 .../gcp/ssn-gke/main/modules/helm_charts/mysql.tf  |  73 ++++
 .../gcp/ssn-gke/main/modules/helm_charts/nginx.tf  |  31 +-
 .../{main.tf => modules/helm_charts/outputs.tf}    |   9 +-
 .../ssn-gke/main/modules/helm_charts/secrets.tf    | 128 ++++++
 .../ssn-gke/main/modules/helm_charts/variables.tf  |  85 ++++
 .../gcp/ssn-gke/main/{main.tf => outputs.tf}       |   6 -
 .../terraform/gcp/ssn-gke/main/variables.tf        | 123 +++++-
 .../main.tf => services/billing-gcp/Dockerfile     |  13 +-
 .../self-service/{Dockerfile => Dockerfile_aws}    |   6 +-
 .../self-service/Dockerfile_gcp                    |  16 +-
 .../{entrypoint.sh => entrypoint_aws.sh}           |   0
 services/self-service/entrypoint_gcp.sh            |  12 +
 61 files changed, 2176 insertions(+), 369 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org