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:30 UTC
[incubator-dlab] branch DLAB-terraform updated (40a8679 -> 93dd033)
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a change to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 40a8679 removed unimportant code;
add 01adf68 fixed issue with service account
add 289f100 fixed issue with service account
add 00eab74 fixed issue with service account
add 07209ef fixed issue with service account
add b2dc082 fixed issue with service account
add 2f3d36d testing output
add 8d3f795 testing output
add af366f5 testing output
add ea902f7 testing output
add e3f05cd testing output
add 4a4a4a8 testing output
add c6e505c testing output
add be9759c testing output
add 6a6592e testing output
add 13b7ccf testing output
add 1b9e663 testing output
add 00e895a testing output
add b5130f5 testing output
add f309bff testing output
add 3809121 testing output
add e3f7dd7 testing output
add cc3516b testing output
add a801978 testing output
add d0a751c testing output
add 1b9d816 modified terraform scripts structure
add fb566a3 fixed typo
add 001bd6b fixed typo
add 8cad265 fixed typo
add 5052726 fixed typo
add 523404c fixed typo
add b0a5599 fixed typo
add 6324a79 fixed typo
add 3970cda fixed typo
add 91d1201 fixed typo
add 32c343d fixed typo
add adf5afc fixed typo
add 47a2945 fixed typo
add 9c466d7 fixed typo
add 6574103 fixed typo
add 0458776 fixed typo
add 55d6734 fixed typo
add 335643d fixed typo
add b2c4015 fixed typo
add 4e05ae9 fixed typo
add 705a43f fixed issue with Keycloak ingress
add 71bd9b5 fixed issue with Load Balancer IP
add 1bbcdc6 fixed issue with terminating;
add 960dd69 fixed issue with terminating;
add 6a35328 fixed issue with terminating;
add cd9934b fixed issue with terminating;
add 87072df Merge branch 'DLAB-terraform' of github.com:apache/incubator-dlab into DLAB-1086
add 54163cf updated Billing Dockerfile
add 395cace added Billing service to GKE;
add 1d65cbd fixed typo
add c0a4db5 fixed typo
add 23b875d fixed typo
add 342a3ba changed service type;
add 2ca12ce changed service type;
add 92277f2 increased timeout for MongoDB;
add 8179ffc increased timeout for MongoDB;
add 874f070 removed unimportant code;
new 93dd033 Merge pull request #305 from apache/DLAB-1086
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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 ++--
.../ssn-gke/main/modules/gke/outputs.tf} | 16 +--
.../ssn-gke/main/modules/gke}/variables.tf | 27 ++---
.../gcp/ssn-gke/main/{ => modules/gke}/vpc.tf | 0
.../helm_charts/dlab-billing-chart}/.helmignore | 0
.../helm_charts}/dlab-billing-chart/Chart.yaml | 0
.../dlab-billing-chart/templates/NOTES.txt | 0
.../dlab-billing-chart/templates/_helpers.tpl | 0
.../templates/configmap-billing-conf.yaml} | 35 ++++--
.../dlab-billing-chart/templates/deployment.yaml | 0
.../dlab-billing-chart/templates/service.yaml | 0
.../helm_charts}/dlab-billing-chart/values.yaml | 17 +--
.../main/modules/helm_charts}/dlab-billing.tf | 19 +---
.../modules/helm_charts}/dlab-ui-chart/.helmignore | 0
.../modules/helm_charts}/dlab-ui-chart/Chart.yaml | 0
.../helm_charts}/dlab-ui-chart/templates/NOTES.txt | 0
.../dlab-ui-chart/templates/_helpers.tpl | 0
.../dlab-ui-chart/templates/configmap-ui-conf.yaml | 30 +++--
.../dlab-ui-chart/templates/deployment.yaml | 2 -
.../dlab-ui-chart/templates/ingress.yaml | 22 +---
.../dlab-ui-chart/templates/service.yaml | 1 -
.../modules/helm_charts}/dlab-ui-chart/values.yaml | 13 +--
.../ssn-gke/main/modules/helm_charts}/dlab-ui.tf | 15 +--
.../helm_charts}/files/configure_keycloak.sh | 0
.../files/dlab/login/resources/css/login.css | 0
.../files/dlab/login/resources/img}/favicon.ico | Bin
.../resources/img/feedback-error-arrow-down.png | Bin
.../login/resources/img/feedback-error-sign.png | Bin
.../resources/img/feedback-success-arrow-down.png | Bin
.../login/resources/img/feedback-success-sign.png | Bin
.../resources/img/feedback-warning-arrow-down.png | Bin
.../login/resources/img/feedback-warning-sign.png | Bin
.../dlab/login/resources/img/keycloak-logo.png | Bin
.../dlab/login/resources}/img/login-background.png | Bin
.../dlab/login/resources}/img/login-icons.png | Bin
.../files/dlab/login/resources}/img/logo.png | Bin
.../helm_charts}/files/dlab/login/theme.properties | 0
.../helm_charts}/files/keycloak_values.yaml | 9 +-
.../modules/helm_charts}/files/mongo_values.yaml | 5 +-
.../modules/helm_charts}/files/mysql_values.yaml | 2 -
.../modules/helm_charts}/files/nginx_values.yaml | 8 +-
.../ssn-gke/main/modules/helm_charts}/keycloak.tf | 40 ++++++-
.../gcp/ssn-gke/main/modules/helm_charts/main.tf | 77 +++++++++++++
.../ssn-gke/main/modules/helm_charts}/mongo.tf | 3 +-
.../ssn-gke/main/modules/helm_charts}/mysql.tf | 67 ++++++-----
.../ssn-gke/main/modules/helm_charts}/nginx.tf | 9 +-
.../ssn-gke/main/modules/helm_charts/outputs.tf} | 0
.../ssn-gke/main/modules/helm_charts}/secrets.tf | 0
.../ssn-gke/main/modules/helm_charts}/variables.tf | 72 +++++++-----
.../gcp/ssn-gke/main/outputs.tf} | 3 +-
.../terraform/gcp/ssn-gke/main/variables.tf | 123 ++++++++++++++++++++-
services/{billing-aws => billing-gcp}/Dockerfile | 4 +-
.../self-service/{Dockerfile => Dockerfile_aws} | 6 +-
.../Dockerfile => self-service/Dockerfile_gcp} | 7 +-
.../{entrypoint.sh => entrypoint_aws.sh} | 0
services/self-service/entrypoint_gcp.sh | 12 ++
61 files changed, 532 insertions(+), 231 deletions(-)
rename infrastructure-provisioning/terraform/gcp/ssn-gke/main/{ => modules/gke}/gke.tf (67%)
rename infrastructure-provisioning/terraform/gcp/ssn-gke/main/{ => modules/gke}/iam.tf (71%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main/nginx.tf => gcp/ssn-gke/main/modules/gke/outputs.tf} (77%)
copy infrastructure-provisioning/terraform/{aws/computational_resources/modules/common => gcp/ssn-gke/main/modules/gke}/variables.tf (75%)
rename infrastructure-provisioning/terraform/gcp/ssn-gke/main/{ => modules/gke}/vpc.tf (100%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main/dlab-ui-chart => gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart}/.helmignore (100%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/dlab-billing-chart/Chart.yaml (100%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/dlab-billing-chart/templates/NOTES.txt (100%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/dlab-billing-chart/templates/_helpers.tpl (100%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main/dlab-billing-chart/templates/service.yaml => gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/templates/configmap-billing-conf.yaml} (59%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/dlab-billing-chart/templates/deployment.yaml (100%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/dlab-billing-chart/templates/service.yaml (100%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/dlab-billing-chart/values.yaml (79%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/dlab-billing.tf (65%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/dlab-ui-chart/.helmignore (100%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/dlab-ui-chart/Chart.yaml (100%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/dlab-ui-chart/templates/NOTES.txt (100%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/dlab-ui-chart/templates/_helpers.tpl (100%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/dlab-ui-chart/templates/configmap-ui-conf.yaml (91%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/dlab-ui-chart/templates/deployment.yaml (97%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/dlab-ui-chart/templates/ingress.yaml (77%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/dlab-ui-chart/templates/service.yaml (98%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/dlab-ui-chart/values.yaml (86%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/dlab-ui.tf (77%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/files/configure_keycloak.sh (100%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/files/dlab/login/resources/css/login.css (100%)
copy {services/self-service/src/main/resources/webapp/src => infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img}/favicon.ico (100%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/files/dlab/login/resources/img/feedback-error-arrow-down.png (100%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/files/dlab/login/resources/img/feedback-error-sign.png (100%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/files/dlab/login/resources/img/feedback-success-arrow-down.png (100%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/files/dlab/login/resources/img/feedback-success-sign.png (100%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/files/dlab/login/resources/img/feedback-warning-arrow-down.png (100%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/files/dlab/login/resources/img/feedback-warning-sign.png (100%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/files/dlab/login/resources/img/keycloak-logo.png (100%)
copy {services/self-service/src/main/resources/webapp/src/assets => infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources}/img/login-background.png (100%)
copy {services/self-service/src/main/resources/webapp/src/assets => infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources}/img/login-icons.png (100%)
copy {services/self-service/src/main/resources/webapp/src/assets => infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources}/img/logo.png (100%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/files/dlab/login/theme.properties (100%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/files/keycloak_values.yaml (94%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/files/mongo_values.yaml (93%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/files/mysql_values.yaml (95%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/files/nginx_values.yaml (92%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/keycloak.tf (72%)
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/main.tf
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/mongo.tf (91%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/mysql.tf (66%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/nginx.tf (83%)
copy infrastructure-provisioning/{src/general/lib/gcp/__init__.py => terraform/gcp/ssn-gke/main/modules/helm_charts/outputs.tf} (100%)
copy infrastructure-provisioning/terraform/{aws/ssn-helm-charts/main => gcp/ssn-gke/main/modules/helm_charts}/secrets.tf (100%)
copy infrastructure-provisioning/terraform/{aws/endpoint/main => gcp/ssn-gke/main/modules/helm_charts}/variables.tf (50%)
copy infrastructure-provisioning/{src/general/lib/azure/__init__.py => terraform/gcp/ssn-gke/main/outputs.tf} (98%)
copy services/{billing-aws => billing-gcp}/Dockerfile (91%)
rename services/self-service/{Dockerfile => Dockerfile_aws} (92%)
copy services/{billing-aws/Dockerfile => self-service/Dockerfile_gcp} (86%)
rename services/self-service/{entrypoint.sh => entrypoint_aws.sh} (100%)
create mode 100644 services/self-service/entrypoint_gcp.sh
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #305 from
apache/DLAB-1086
Posted by om...@apache.org.
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