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/07/15 11:58:40 UTC

[incubator-dlab] 01/01: Merge pull request #157 from apache/DLAB-836

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 d96fcce29e98e1169a4c84731ef2c72929de4306
Merge: 700e373 bdc4769
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Mon Jul 15 14:58:35 2019 +0300

    Merge pull request #157 from apache/DLAB-836
    
    [DLAB-901][DLAB-902]

 .../ami/main}/ami.tf                               |   0
 .../ami/main}/variables.tf                         |   0
 .../common/main}/iam.tf                            |   0
 .../common/main}/network.tf                        |   0
 .../common/main}/variables.tf                      |   0
 .../data_engine/main}/instance.tf                  |   0
 .../data_engine/main/main.tf}                      |   3 +-
 .../data_engine/main}/variables.tf                 |   0
 .../emr/main}/instance.tf                          |   0
 .../aws/computational_resources/emr/main/main.tf   |   0
 .../emr/main}/variables.tf                         |   0
 .../notebooks/main}/instance.tf                    |   0
 .../computational_resources/notebooks/main/main.tf |   0
 .../notebooks/main}/variables.tf                   |   0
 .../{modules/endpoint => endpoint/main}/README.md  |   0
 .../main}/files/assume-policy.json                 |   0
 .../main}/files/endpoint-policy.json               |   0
 .../aws/{modules/endpoint => endpoint/main}/iam.tf |   0
 .../endpoint => endpoint/main}/instance.tf         |   0
 .../variables.tf => endpoint/main/main.tf}         |   8 +-
 .../{modules/endpoint => endpoint/main}/network.tf |   0
 .../endpoint => endpoint/main}/variables.tf        |   7 +
 .../terraform/aws/main/main.tf                     | 155 ---------------------
 .../terraform/aws/modules/nginx/variables.tf       |  28 ----
 .../terraform/aws/modules/ssn-k8s/lb.tf            |  54 -------
 .../terraform/aws/modules/ssn-k8s/variables.tf     |  56 --------
 .../main}/dlab-ui-chart/.helmignore                |   0
 .../main}/dlab-ui-chart/Chart.yaml                 |   0
 .../main}/dlab-ui-chart/templates/NOTES.txt        |   0
 .../main}/dlab-ui-chart/templates/_helpers.tpl     |   0
 .../main}/dlab-ui-chart/templates/deployment.yaml  |  26 ++--
 .../main}/dlab-ui-chart/templates/ingress.yaml     |  12 +-
 .../main}/dlab-ui-chart/templates/service.yaml     |   8 +-
 .../main}/dlab-ui-chart/values.yaml                |   7 +-
 .../Chart.yaml => ssn-helm-charts/main/dlab-ui.tf} |  10 +-
 .../keycloak => ssn-helm-charts/main}/ingress.yaml |   0
 .../keycloak => ssn-helm-charts/main}/keycloak.tf  |   2 +-
 .../Chart.yaml => ssn-helm-charts/main/main.tf}    |  12 +-
 .../mongo => ssn-helm-charts/main}/mongo.tf        |  10 +-
 .../keycloak => ssn-helm-charts/main}/mysql.tf     |   0
 .../nginx => ssn-helm-charts/main}/nginx.tf        |   9 +-
 .../mongo => ssn-helm-charts/main}/variables.tf    |   9 ++
 .../{modules/ssn-k8s => ssn-k8s/main}/README.md    |   0
 .../main}/auto_scaling_groups.tf                   |  19 ++-
 .../main}/files/assume-policy.json                 |   0
 .../main}/files/masters-user-data.sh               |  54 +++----
 .../main}/files/ssn-policy.json.tpl                |   0
 .../main}/files/workers-user-data.sh               |   0
 .../terraform/aws/ssn-k8s/main/lb.tf               |  83 +++++++++++
 .../Chart.yaml => ssn-k8s/main/main.tf}            |  10 +-
 .../ssn-k8s => ssn-k8s/main}/role_policy.tf        |   4 +-
 .../aws/{modules/ssn-k8s => ssn-k8s/main}/s3.tf    |   0
 .../ssn-k8s => ssn-k8s/main}/security_groups.tf    |  30 ++--
 .../terraform/aws/{ => ssn-k8s}/main/variables.tf  | 103 ++------------
 .../aws/{modules/ssn-k8s => ssn-k8s/main}/vpc.tf   |  74 ++++++++--
 .../terraform/bin/terraform-cli.py                 |  18 ++-
 56 files changed, 313 insertions(+), 498 deletions(-)


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