[incubator-dlab] branch DLAB-terraform updated: updated README; added Helm installation
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 d95333c updated README; added Helm installation
d95333c is described below
commit d95333c977393527c23b7bd3021684d899c25435
Author: Oleh Martushevskyi
AuthorDate: Tue Jul 2 17:19:11 2019 +0300
updated README;
added Helm installation
---
README.md | 22 +-
.../aws/modules/ssn-k8s/files/masters-user-data.sh | 26 ++
2 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
index 761c974..8bece93 100644
--- a/README.md
+++ b/README.md
@@ -162,27 +162,27 @@ That simplifies running big data frameworks, such as
Apache Hadoop and Apache Sp
Prerequisites:
DLab can be deployed using the following two methods:
- - IAM user: DLab deployment script can be executed on local machine and will
use IAM user permissions to create resources in AWS.
- - EC2 instance: DLab deployment script can be executed on previously prepared
EC2 instance with attached IAM role. Deployment script will use the attached
role to create resources in AWS.
+ - IAM user: DLab deployment script is executed on local machine and uses IAM
user permissions to create resources in AWS.
+ - EC2 instance: DLab deployment script is executed on EC2 instance prepared
in advance and with attached IAM role. Deployment script uses the attached IAM
role to create resources in AWS.
**'IAM user' method prerequisites:**
- - IAM user with created AWS access key ID and secret access key. These keys
will be provided as arguments for deployment script and will be used for
getting permissions to create resources in AWS.
- - Amazon EC2 Key Pair. This key will be used for accessing all DLab instances.
- - All actions in this [policy](#AWS_SSN_policy) should be assigned to IAM
user in order to deploy DLab:
+ - IAM user with created AWS access key ID and secret access key. These keys
are provided as arguments for the deployment script and are used to create
resources in AWS.
+ - Amazon EC2 Key Pair. This key is system and is used for configuring DLab
instances.
+ - The following IAM [policy](#AWS_SSN_policy) should be attached to the IAM
user in order to deploy DLab.
**'EC2 instance' method prerequisites:**
- - Amazon EC2 Key Pair. This key will be used for accessing all DLab
instances.
- - EC2 instance where DLab deployment script will be executed.
- - IAM role with such [policy](#AWS_SSN_policy) attached should be assigned to
the EC2 instance.
+ - Amazon EC2 Key Pair. This key is system and is used for configuring DLab
instances.
+ - EC2 instance where DLab deployment script is executed.
+ - IAM role with the following IAM [policy](#AWS_SSN_policy) should be
attached to the EC2 instance.
**Optional prerequisites for both methods:**
- - VPC ID. If you already have VPC created, you can provide VPC ID for
deployment script and all DLab instances will be deployed in this VPC.
- - Subnet ID. DLab will deploy SSN node and user's Edge nodes in this subnet.
This parameter also can be provided for deployment script.
+ - VPC ID. If VPC where DLab should be deployed is already in place, then
"VPC ID" should be provided for deployment script. DLab instances are deployed
in this VPC.
+ - Subnet ID. If Subnet where DLab should be deployed is already in place,
then "Subnet ID" should be provided for deployment script. DLab SSN node and
users' Edge nodes are deployed in this Subnet.
- DLab Policy
+ DLab IAM Policy
```
{
diff --git
a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/files/masters-user-data.sh
b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/files/masters-user-data.sh
index 0dd15d1..850884e 100644
---
a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/files/masters-user-data.sh
+++
b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/files/masters-user-data.sh
@@ -74,6 +74,29 @@ sudo kubeadm token create --print-join-command >
/tmp/join_command
sudo kubeadm init phase upload-certs --upload-certs | grep -v "upload-certs" >
/tmp/cert_key
sudo -i -u ${k8s-os-user} kubectl apply -f \
"https://cloud.weave.works/k8s/net?k8s-version=$(sudo -i -u
${k8s-os-user} kubectl version | base64 | tr -d '\n')"
+sudo -i -u ${k8s-os-user} bash -c 'curl -L https://git.io/get_helm.sh | bash'
+cat < /tmp/rbac-config.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+ name: tiller
+ namespace: kube-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+ name: tiller
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: ClusterRole
+ name: cluster-admin
+subjects:
+ - kind: ServiceAccount
+name: tiller
+namespace: kube-system
+E
[incubator-dlab] branch feature/projects updated: DLAB-833 added API for activating/deactivating project
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/feature/projects by this push:
new 5fed1d4 DLAB-833 added API for activating/deactivating project
5fed1d4 is described below
commit 5fed1d452bf3259b20c0d2a080b355cc3162d82f
Author: bhliva
AuthorDate: Tue Jul 2 17:09:00 2019 +0300
DLAB-833 added API for activating/deactivating project
---
...jectTerminateDTO.java => ProjectActionDTO.java} | 2 +-
.../dlab/backendapi/resources/ProjectResource.java | 20 ++--
.../dlab/backendapi/service/ProjectService.java| 9 --
.../service/impl/ProjectServiceImpl.java | 30 --
.../epam/dlab/backendapi/domain/EndpointDTO.java | 2 ++
.../epam/dlab/backendapi/domain/ProjectDTO.java| 7 +++-
.../dlab/backendapi/resources/ProjectResource.java | 37 ++
.../resources/dto/ProjectActionFormDTO.java| 10 ++
.../dlab/backendapi/service/ProjectService.java| 2 ++
.../impl/InfrastructureInfoServiceBase.java| 6 ++--
.../service/impl/ProjectServiceImpl.java | 24 +++---
11 files changed, 126 insertions(+), 23 deletions(-)
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectTerminateDTO.java
b/services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectActionDTO.java
similarity index 77%
rename from
services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectTerminateDTO.java
rename to
services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectActionDTO.java
index 533e342..1634c11 100644
---
a/services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectTerminateDTO.java
+++
b/services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectActionDTO.java
@@ -7,7 +7,7 @@ import lombok.Data;
@Data
@AllArgsConstructor
-public class ProjectTerminateDTO extends ResourceBaseDTO {
+public class ProjectActionDTO extends ResourceBaseDTO {
@JsonProperty("project_name")
private final String name;
}
diff --git
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
index fa7aee1..005ad9f 100644
---
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
+++
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
@@ -2,8 +2,8 @@ package com.epam.dlab.backendapi.resources;
import com.epam.dlab.auth.UserInfo;
import com.epam.dlab.backendapi.service.ProjectService;
+import com.epam.dlab.dto.project.ProjectActionDTO;
import com.epam.dlab.dto.project.ProjectCreateDTO;
-import com.epam.dlab.dto.project.ProjectTerminateDTO;
import com.google.inject.Inject;
import io.dropwizard.auth.Auth;
@@ -35,7 +35,23 @@ public class ProjectResource {
@POST
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- public Response terminateProject(@Auth UserInfo userInfo,
ProjectTerminateDTO dto) {
+ public Response terminateProject(@Auth UserInfo userInfo,
ProjectActionDTO dto) {
return Response.ok(projectService.terminate(userInfo,
dto)).build();
}
+
+ @Path("/start")
+ @POST
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response startProject(@Auth UserInfo userInfo, ProjectActionDTO
dto) {
+ return Response.ok(projectService.start(userInfo, dto)).build();
+ }
+
+ @Path("/stop")
+ @POST
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response stopProject(@Auth UserInfo userInfo, ProjectActionDTO
dto) {
+ return Response.ok(projectService.stop(userInfo, dto)).build();
+ }
}
diff --git
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java
index b18aa8c..65d4b70 100644
---
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java
+++
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java
@@ -1,11 +1,16 @@
package com.epam.dlab.backendapi.service;
import com.epam.dlab.auth.UserInfo;
+import com.epam.dlab.dto.project.ProjectActionDTO;
import com.epam.dlab.dto.project.ProjectCreateDTO;
-import com.epam.dlab.dto.project.ProjectTerminateDTO;
public interface ProjectService {
String create(UserInfo userInfo, ProjectCreateDTO projectCreateDTO);
- String terminate(UserInfo userInfo, ProjectTerminateDTO dto);
+
+
[incubator-dlab] branch develop updated (21a9bb0 -> d2d1de3)
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 21a9bb0 DLAB-608 changed error message for scheduler validation add aa88485 [DLAB-810] Truned off proxy buffering in nginx new d2d1de3 Merge pull request #136 from apache/DLAB-810 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: infrastructure-provisioning/src/ssn/templates/ssn_nginx.conf | 1 + 1 file changed, 1 insertion(+) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-810 deleted (was aa88485)
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a change to branch DLAB-810 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. was aa88485 [DLAB-810] Truned off proxy buffering in nginx The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #136 from apache/DLAB-810
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit d2d1de392665a66b12294d268c5efe671dafcf06 Merge: 21a9bb0 aa88485 Author: bhliva AuthorDate: Tue Jul 2 17:04:24 2019 +0300 Merge pull request #136 from apache/DLAB-810 [DLAB-810] Truned off proxy buffering in nginx infrastructure-provisioning/src/ssn/templates/ssn_nginx.conf | 1 + 1 file changed, 1 insertion(+) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-810] Truned off proxy buffering in nginx
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch DLAB-810
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit aa88485b198409266fafafcbba206fdd20cc143c
Author: Dyoma33
AuthorDate: Tue Jul 2 16:59:56 2019 +0300
[DLAB-810] Truned off proxy buffering in nginx
---
infrastructure-provisioning/src/ssn/templates/ssn_nginx.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/infrastructure-provisioning/src/ssn/templates/ssn_nginx.conf
b/infrastructure-provisioning/src/ssn/templates/ssn_nginx.conf
index ff997eb..dd9d035 100644
--- a/infrastructure-provisioning/src/ssn/templates/ssn_nginx.conf
+++ b/infrastructure-provisioning/src/ssn/templates/ssn_nginx.conf
@@ -40,6 +40,7 @@ http {
sendfileon;
tcp_nopush on;
tcp_nodelay on;
+proxy_buffering off;
keepalive_timeout 65;
types_hash_max_size 2048;
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-810 created (now aa88485)
This is an automated email from the ASF dual-hosted git repository. dmysakovets pushed a change to branch DLAB-810 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at aa88485 [DLAB-810] Truned off proxy buffering in nginx This branch includes the following new commits: new aa88485 [DLAB-810] Truned off proxy buffering in nginx 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. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-810 deleted (was e5ec8eb)
This is an automated email from the ASF dual-hosted git repository. dmysakovets pushed a change to branch DLAB-810 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. was e5ec8eb [DLAB-810] Truned off proxy buffering in nginx The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-810] Truned off proxy buffering in nginx
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch DLAB-810
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit e5ec8eb358f732c8419290cb2f6ecd271eeb5a80
Author: Dyoma33
AuthorDate: Tue Jul 2 16:47:50 2019 +0300
[DLAB-810] Truned off proxy buffering in nginx
---
infrastructure-provisioning/src/edge/templates/nginx.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/infrastructure-provisioning/src/edge/templates/nginx.conf
b/infrastructure-provisioning/src/edge/templates/nginx.conf
index 6261f53..ae439c5 100644
--- a/infrastructure-provisioning/src/edge/templates/nginx.conf
+++ b/infrastructure-provisioning/src/edge/templates/nginx.conf
@@ -39,6 +39,7 @@ http {
sendfileon;
tcp_nopush on;
tcp_nodelay on;
+proxy_buffering off;
keepalive_timeout 100;
types_hash_max_size 2048;
proxy_read_timeout 86400s;
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch feature/projects updated: [DLAB-827]: unify scrollers
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/feature/projects by this push:
new 415f312 [DLAB-827]: unify scrollers
new a541b04 Merge branch 'feature/projects' of
github.com:apache/incubator-dlab into feature/projects
415f312 is described below
commit 415f3123752e030887db21db61bfd646bc39ce16
Author: Andriana Kovalyshyn
AuthorDate: Tue Jul 2 16:46:31 2019 +0300
[DLAB-827]: unify scrollers
---
.../app/administration/roles/roles.component.scss | 60 --
.../resources/webapp/src/assets/styles/_theme.scss | 1 +
2 files changed, 56 insertions(+), 5 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss
b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss
index aee43a3..aef38c3 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss
@@ -17,7 +17,9 @@
* under the License.
*/
-::ng-deep .mat-option:first-child .mat-pseudo-checkbox { display: none; }
+::ng-deep .mat-option:first-child .mat-pseudo-checkbox {
+ display: none;
+}
.caret {
width: 40px;
@@ -31,6 +33,7 @@
height: 36px;
line-height: 1;
cursor: pointer;
+
&.not-allowed {
background-color: #dcdcdc;
}
@@ -41,12 +44,15 @@
height: 85vh;
overflow-y: auto;
}
+
.no-details {
color: #d8d8d8;
}
+
.stepper {
height: 190px;
margin-top: 10px;
+
.inner-step {
height: 70px;
padding: 5px;
@@ -54,16 +60,19 @@
justify-content: center;
flex-direction: column;
text-align: center;
+
input {
width: 490px;
align-self: center;
}
+
.caret {
i {
margin-top: 3px;
}
}
}
+
.text-center {
button {
&:not(:last-child) {
@@ -72,6 +81,7 @@
}
}
}
+
.selector-wrapper {
display: flex;
align-self: center;
@@ -82,37 +92,47 @@
font-size: 15px;
font-weight: 300;
box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0,
0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
+
mat-form-field {
width: 100%;
+
.mat-form-field-wrapper {
padding-bottom: 0;
}
+
.mat-icon {
font-size: 20px;
}
}
+
.dropdown-multiselect {
width: 100% !important;
-> button {
+
+>button {
padding: 6px 22px;
}
}
}
+
.list-header {
padding: 0 15px;
}
+
.scrolling-content {
max-height: 450px;
overflow-x: hidden;
overflow-y: auto;
display: block;
padding: 15px 5px;
+
&.stepper-opened {
height: 250px;
}
}
+
.roles {
width: 30%;
+
.selector-wrapper-edit {
position: relative;
display: flex;
@@ -121,14 +141,17 @@
padding-left: 10px;
background: #fff;
box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0,
0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
+
multi-select-dropdown {
width: 100%;
+
.dropdown-multiselect {
-> button {
+>button {
padding: 8px 22px 5px;
}
}
}
+
.caret {
&:hover {
box-shadow: 0 3px 1px -10px rgba(0, 0, 0, 0.2), 0 2px 1px 0 rgba(0, 0,
0, 0.17), 0 1px 5px 0 rgba(0, 0, 0, 0.12)
@@ -136,13 +159,16 @@
}
}
}
+
.groups {
width: 20%;
}
+
.users {
width: 30%;
padding: 0 10px;
}
+
.users-list {
padding: 5px 10px;
font-family: 'Open Sans', sans-serif;
@@ -150,11 +176,13 @@
font-weight: 300;
color: #577289;
position: relative;
+
i {
color: #FF5722;
font-size: 18px;
cursor: pointer;
}
+
.list-selected {
width: 100%;
margin-top: 50px;
@@ -163,21 +191,25 @@
overflow: hidden;
}
}
+
.expanded-panel {
display: flex;
align-items: flex-end;
+
.add-input-block {
display: flex;
height: 36px;
padding-right: 0;
outline: none;
box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0,
0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
+
input {
height: 36px;
padding: 0;
padding-left: 10px;
width: 170px;
}
+
.caret {
width: 50px;
}
@@ -198,6 +230,7 @@ mat-expansion-panel-header {
.mat-step-icon {
background-color: #36afd5 !important;
}
+
.mat-step-label {
font-family: 'Open Sans', sans-serif;
font-size: 16px;
@@ -210,10 +243,12 @@ mat-expansion-panel-header {
.actions {
padding: 10px 0;
}
+
&.filter-row {
.actions {
button {
background: none;
+
.mid {
vertical-align: sub;
}
@@ -221,13 +256,14 @@ mat-expansion-panel-header {
[incubator-dlab] branch DLAB-810 created (now e5ec8eb)
This is an automated email from the ASF dual-hosted git repository. dmysakovets pushed a change to branch DLAB-810 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at e5ec8eb [DLAB-810] Truned off proxy buffering in nginx This branch includes the following new commits: new e5ec8eb [DLAB-810] Truned off proxy buffering in nginx 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. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-terraform updated: updated README
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 60de362 updated README
60de362 is described below
commit 60de36246ff60f5e5febd072df0347c1816b2fc5
Author: Oleh Martushevskyi
AuthorDate: Tue Jul 2 16:06:55 2019 +0300
updated README
---
README.md | 172 +-
1 file changed, 115 insertions(+), 57 deletions(-)
diff --git a/README.md b/README.md
index 88d49de..761c974 100644
--- a/README.md
+++ b/README.md
@@ -160,67 +160,125 @@ That simplifies running big data frameworks, such as
Apache Hadoop and Apache Sp
## Prerequisites
In Amazon cloud
Prerequisites:
+
+DLab can be deployed using the following two methods:
+ - IAM user: DLab deployment script can be executed on local machine and will
use IAM user permissions to create resources in AWS.
+ - EC2 instance: DLab deployment script can be executed on previously prepared
EC2 instance with attached IAM role. Deployment script will use the attached
role to create resources in AWS.
+
+**'IAM user' method prerequisites:**
+
+ - IAM user with created AWS access key ID and secret access key. These keys
will be provided as arguments for deployment script and will be used for
getting permissions to create resources in AWS.
+ - Amazon EC2 Key Pair. This key will be used for accessing all DLab instances.
+ - All actions in this [policy](#AWS_SSN_policy) should be assigned to IAM
user in order to deploy DLab:
+
+ **'EC2 instance' method prerequisites:**
- - SSH key for EC2 instances. This key could be created through Amazon Console.
- - IAM user
- - AWS access key ID and secret access key
- - The following permissions should be assigned for IAM user:
+ - Amazon EC2 Key Pair. This key will be used for accessing all DLab
instances.
+ - EC2 instance where DLab deployment script will be executed.
+ - IAM role with such [policy](#AWS_SSN_policy) attached should be assigned to
the EC2 instance.
+
+ **Optional prerequisites for both methods:**
+
+ - VPC ID. If you already have VPC created, you can provide VPC ID for
deployment script and all DLab instances will be deployed in this VPC.
+ - Subnet ID. DLab will deploy SSN node and user's Edge nodes in this subnet.
This parameter also can be provided for deployment script.
+
+ DLab Policy
```
{
- "Version": "2012-10-17",
- "Statement": [
- {
- "Action": [
- "iam:ListRoles",
- "iam:CreateRole",
- "iam:CreateInstanceProfile",
- "iam:PutRolePolicy",
- "iam:AddRoleToInstanceProfile",
- "iam:PassRole",
- "iam:GetInstanceProfile",
- "iam:ListInstanceProfilesForRole"
- "iam:RemoveRoleFromInstanceProfile",
- "iam:DeleteInstanceProfile",
- "iam:TagRole"
- ],
- "Effect": "Allow",
- "Resource": "*"
- },
- {
- "Action": [
- "ec2:DescribeImages",
- "ec2:CreateTags",
- "ec2:DescribeRouteTables",
- "ec2:CreateRouteTable",
- "ec2:AssociateRouteTable",
- "ec2:DescribeVpcEndpoints",
- "ec2:CreateVpcEndpoint",
- "ec2:ModifyVpcEndpoint",
- "ec2:DescribeInstances",
- "ec2:RunInstances",
- "ec2:DescribeAddresses",
- "ec2:AllocateAddress",
- "ec2:DescribeInstances",
- "ec2:AssociateAddress",
- "ec2:DisassociateAddress",
- "ec2:ReleaseAddress",
- "ec2:TerminateInstances"
- ],
- "Effect": "Allow",
- "Resource": "*"
- },
- {
- "Action": [
- "s3:ListAllMyBuckets",
- "s3:CreateBucket",
- "s3:PutBucketTagging",
- "s3:GetBucketTagging"
- ],
- "Effect": "Allow",
- "Resource": "*"
- }
- ]
+"Version": "2012-10-17",
+"Stat
[incubator-dlab] branch feature/projects updated (595c24f -> b9f4cab)
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a change to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 595c24f Merge branch 'feature/projects' of
github.com:apache/incubator-dlab into feature/projects
new 1ac29a1 aws - edge stop/start/status Docker file returned
new d0b5247 aws - edge stop/start/status Docker file returned
new 8bc44db README.md deleted by mistake fixede
new b9f4cab Merge pull request #133 from bodnarmykola/DLAB-748
The 6247 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:
.../src/general/files/aws/{project_Dockerfile => edge_Dockerfile} | 4 ++--
.../src/general/files/aws/edge_description.json | 4
2 files changed, 6 insertions(+), 2 deletions(-)
copy infrastructure-provisioning/src/general/files/aws/{project_Dockerfile =>
edge_Dockerfile} (94%)
create mode 100644
infrastructure-provisioning/src/general/files/aws/edge_description.json
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-terraform updated: fixed issues
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 17c4011 fixed issues
17c4011 is described below
commit 17c40118e60b0cabd2e2e0fac7687d35daddf2e2
Author: Oleh Martushevskyi
AuthorDate: Tue Jul 2 15:25:14 2019 +0300
fixed issues
---
.../terraform/aws/modules/ssn-k8s/auto_scaling_groups.tf| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/auto_scaling_groups.tf
b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/auto_scaling_groups.tf
index def0910..8925ddf 100644
---
a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/auto_scaling_groups.tf
+++
b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/auto_scaling_groups.tf
@@ -1,7 +1,7 @@
data "template_file" "ssn_k8s_masters_user_data" {
template = file("../modules/ssn-k8s/files/masters-user-data.sh")
vars = {
-k8s-asg = "${var.service_base_name}-master"
+k8s-asg = "${var.service_base_name}-ssn-masters"
k8s-region = var.region
k8s-bucket-name = aws_s3_bucket.ssn_k8s_bucket.id
k8s-eip = aws_eip.k8s-lb-eip.public_ip
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch feature/projects updated (cb60569 -> 595c24f)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch feature/projects in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from cb60569 Merge pull request #131 from bodnarmykola/DLAB-748 new 4e8562d [DLAB-828]: reset key label on form clear new 2e04372 [DLAB-828]: fixed issue with uploading key after form reinit new f368f01 [DLAB-827]: cut group name on confirmation dialog for termination new 3653ab3 [DLAB-827]: unify scrollers new 595c24f Merge branch 'feature/projects' of github.com:apache/incubator-dlab into feature/projects The 5 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: .../project/project-form/project-form.component.ts | 5 ++- .../app/administration/roles/roles.component.ts| 13 +++--- .../src/app/shared/navbar/navbar.component.html| 2 +- .../src/main/resources/webapp/src/styles.scss | 47 +++--- 4 files changed, 51 insertions(+), 16 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 04/05: [DLAB-827]: unify scrollers
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 3653ab318a35d4e1a9feba671373e277623ff72d
Author: Andriana Kovalyshyn
AuthorDate: Tue Jul 2 15:09:16 2019 +0300
[DLAB-827]: unify scrollers
---
.../src/app/shared/navbar/navbar.component.html| 2 +-
.../src/main/resources/webapp/src/styles.scss | 47 +++---
2 files changed, 42 insertions(+), 7 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
index c5a424f..ceb18f0 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
@@ -101,7 +101,7 @@
-
+
diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss
b/services/self-service/src/main/resources/webapp/src/styles.scss
index bffb5bd..ed72357 100644
--- a/services/self-service/src/main/resources/webapp/src/styles.scss
+++ b/services/self-service/src/main/resources/webapp/src/styles.scss
@@ -47,10 +47,12 @@
background-color: rgba(53, 175, 213, 0.11) !important;
color: #577289;
}
+
.mat-tab-header-pagination.mat-tab-header-pagination-after,
.mat-tab-header-pagination.mat-tab-header-pagination-before {
display: none !important;
}
+
.mat-drawer-container {
height: calc(100% - 48px);
}
@@ -61,6 +63,7 @@ mat-chip.mat-chip {
font-size: 14px;
padding: 8px 18px;
}
+
mat-chip.mat-chip a {
display: inline-block;
width: 12px;
@@ -89,10 +92,12 @@ mat-chip.mat-chip strong {
margin-right: 15px;
float: right;
}
+
.rotate {
-webkit-animation: spin 2s linear infinite;
animation: spin 2s linear infinite;
}
+
.status {
text-transform: capitalize;
}
@@ -127,6 +132,7 @@ mat-chip.mat-chip strong {
color: #f1696e;
font-size: 12px;
}
+
.not-allowed {
cursor: not-allowed !important;
user-select: none;
@@ -143,6 +149,7 @@ mat-chip.mat-chip strong {
padding: 40px 20px;
text-align: center;
}
+
.info {
font-size: 15px;
font-weight: 300;
@@ -167,6 +174,7 @@ mat-chip.mat-chip strong {
0% {
-webkit-transform: rotate(0deg);
}
+
100% {
-webkit-transform: rotate(360deg);
}
@@ -176,6 +184,7 @@ mat-chip.mat-chip strong {
0% {
transform: rotate(0deg);
}
+
100% {
transform: rotate(360deg);
}
@@ -235,10 +244,12 @@ mat-chip.mat-chip strong {
}
/* IE can just show/hide with no transition */
-@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
+@media all and (-ms-high-contrast: none),
+(-ms-high-contrast: active) {
.tooltip-wrap .tooltip {
display: none;
}
+
.tooltip-wrap:hover .tooltip {
display: block;
}
@@ -259,32 +270,43 @@ input[type='number'] {
.text-center {
text-align: center !important;
}
+
.text-right {
text-align: right;
}
+
.m-top-10 {
margin-top: 10px;
}
+
.m-top-15 {
margin-top: 15px;
}
+
.m-top-20 {
margin-top: 20px;
}
+
.m-top-30 {
margin-top: 30px;
}
+
.m-bott-10 {
margin-bottom: 10px;
}
+
.m-top-10p {
margin-top: 10%;
}
-.ml-10 { margin-left: 10px; }
+
+.ml-10 {
+ margin-left: 10px;
+}
.full-height {
height: 100%;
}
+
.ani {
transition: all .35s ease-in-out;
}
@@ -295,6 +317,7 @@ input[type='number'] {
align-items: center;
justify-content: center;
height: 100%;
+
.content {
text-align: center;
}
@@ -302,7 +325,8 @@ input[type='number'] {
#scrolling::-webkit-scrollbar,
.list-selected mat-chip-list .mat-chip-list-wrapper::-webkit-scrollbar {
- width: 6px;
+ width: 5px;
+ height: 5px;
}
#scrolling::-webkit-scrollbar-track,
@@ -327,6 +351,7 @@ input[type='number'] {
color: #fff;
background: #e2747d;
word-break: break-word;
+
span {
position: absolute;
top: -12px;
@@ -346,20 +371,22 @@ input[type='number'] {
white-space: nowrap;
overflow: hidden;
}
+
.capitalize {
text-transform: capitalize;
}
.overlay-container {
#toast-container {
-> div.toast {
- box-shadow: 0 3px 1px -2px rgba(0,0,0,.2), 0 2px 2px 0 rgba(0,0,0,.14),
0 1px 5px 0 rgba(0,0,0,.12);
+>div.toast {
+ box-shadow: 0 3px 1px -2px rgba(0, 0, 0, .2), 0 2px 2px 0 rgba(0, 0, 0,
.14), 0 1px 5px 0 rgba(0, 0, 0, .12);
border-radius: 2px;
background-color: #fff;
padding: 12px 20px;
overflow: inherit;
margin: 0 0 15px;
font-size: 14px;
+
&::before {
position: absolute;
left: -15px;
@@ -371,32 +398,40 @@ input[type='number'] {
padding: 7px;
box-sizing: border-box;
border-radius: 50%;
-box-shadow: 0 3px 1px -2px rgba(0,0,0,.2), 0 2px 2px 0
[incubator-dlab] 02/05: [DLAB-828]: fixed issue with uploading key after form reinit
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 2e04372a361b492b8dc4fa9925c69f7d0462688a
Author: Andriana Kovalyshyn
AuthorDate: Tue Jul 2 12:01:45 2019 +0300
[DLAB-828]: fixed issue with uploading key after form reinit
---
.../app/administration/project/project-form/project-form.component.ts | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
index 05d079c..c56b84a 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
@@ -100,8 +100,9 @@ export class ProjectFormComponent implements OnInit {
public onFileChange($event) {
const reader = new FileReader();
+const files = $event.target.files;
-if ($event.target.files && $event.target.files.length) {
+if (files && files.length) {
const [file] = $event.target.files;
reader.readAsBinaryString(file);
@@ -112,6 +113,7 @@ export class ProjectFormComponent implements OnInit {
this.accessKeyValid = this.isValidKey(file.name);
this.keyLabel = this.getLabel(file);
+$event.target.value = '';
this.cd.markForCheck();
};
}
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 05/05: Merge branch 'feature/projects' of github.com:apache/incubator-dlab into feature/projects
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 595c24f388f9df4258628b3164164e3cbf2c1251
Merge: 3653ab3 cb60569
Author: Andriana Kovalyshyn
AuthorDate: Tue Jul 2 15:09:40 2019 +0300
Merge branch 'feature/projects' of github.com:apache/incubator-dlab into
feature/projects
infrastructure-provisioning/src/edge/fabfile.py| 147 ---
.../src/general/lib/os/debian/edge_lib.py | 4 +-
.../src/general/lib/os/redhat/edge_lib.py | 4 +-
.../src/general/scripts/aws/project_prepare.py | 6 +
.../src/general/scripts/aws/ssn_configure.py | 1 +
.../src/general/scripts/gcp/project_prepare.py | 467 +
.../src/general/scripts/gcp/ssn_configure.py | 2 +-
.../scripts/configure_nginx_reverse_proxy.py | 17 +-
.../src/project/templates/nginx.conf | 20 +-
...CreateProjectResult.java => ProjectResult.java} | 2 +-
.../dlab/dto/{ => project}/ProjectCreateDTO.java | 3 +-
.../epam/dlab/dto/project/ProjectTerminateDTO.java | 13 +
.../response/handlers/ProjectCallbackHandler.java | 12 +-
.../dlab/backendapi/resources/ProjectResource.java | 12 +-
.../dlab/backendapi/service/ProjectService.java| 4 +-
.../service/impl/ProjectServiceImpl.java | 22 +-
.../mock_response/gcp/project_terminate.json | 12 +
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 +-
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 9 +-
.../epam/dlab/backendapi/domain/ProjectDTO.java| 12 +-
.../dlab/backendapi/resources/ProjectResource.java | 6 +-
.../resources/callback/ProjectCallback.java| 14 +-
.../dlab/backendapi/service/ProjectService.java| 3 +-
.../service/impl/ProjectServiceImpl.java | 25 +-
24 files changed, 680 insertions(+), 139 deletions(-)
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 03/05: [DLAB-827]: cut group name on confirmation dialog for termination
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit f368f01f24d4a137973a7c4d765373045bef3ecb
Author: Andriana Kovalyshyn
AuthorDate: Tue Jul 2 12:04:22 2019 +0300
[DLAB-827]: cut group name on confirmation dialog for termination
---
.../webapp/src/app/administration/roles/roles.component.ts | 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
index a47c9ee..eb5d902 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
@@ -23,6 +23,7 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from
'@angular/material';
import { ToastrService } from 'ngx-toastr';
import { RolesGroupsService, HealthStatusService } from '../../core/services';
+import { CheckUtils } from '../../core/util';
import { DICTIONARY } from '../../../dictionary/global.dictionary';
@Component({
@@ -173,11 +174,11 @@ export class RolesComponent implements OnInit {
}
public groupValidarion(): ValidatorFn {
-
const duplicateList: any = this.groupsData.map(item => item.group);
return ((control: FormControl) => {
- if (control.value &&
duplicateList.includes(this.delimitersFiltering(control.value)))
+ if (control.value &&
duplicateList.includes(CheckUtils.delimitersFiltering(control.value))) {
return { duplicate: true };
+ }
if (control.value && !this.groupnamePattern.test(control.value))
return { patterns: true };
@@ -190,10 +191,6 @@ export class RolesComponent implements OnInit {
return o1.toLowerCase() === o2.toLowerCase();
}
- public delimitersFiltering(resource): string {
-return resource.replace(this.delimitersRegex, '').toString().toLowerCase();
- }
-
public resetDialog() {
this.stepperView = false;
this.setupGroup = '';
@@ -229,7 +226,7 @@ export class RolesComponent implements OnInit {
User {{ data.user }} will be deleted
from {{ data.group }} group.
-Group {{ data.group }} will be
decommissioned.
+Group {{ data.group
}} will be decommissioned.
Do you want to proceed?
@@ -237,7 +234,7 @@ export class RolesComponent implements OnInit {
Yes
`,
- styles: []
+ styles: [`.group-name { max-width: 96%; display: inline-block; }`]
})
export class ConfirmDeleteUserAccountDialogComponent {
constructor(
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/05: [DLAB-828]: reset key label on form clear
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 4e8562dc8fcad4d30352b3353ee4e05d7b8993d3
Author: Andriana Kovalyshyn
AuthorDate: Mon Jul 1 15:17:02 2019 +0300
[DLAB-828]: reset key label on form clear
---
.../app/administration/project/project-form/project-form.component.ts| 1 +
1 file changed, 1 insertion(+)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
index c3f7297..05d079c 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
@@ -89,6 +89,7 @@ export class ProjectFormComponent implements OnInit {
}
public reset() {
+this.keyLabel = '';
this.initFormModel();
}
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-terraform updated: fixed issues
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 c123182 fixed issues
c123182 is described below
commit c1231829f050eede64312758be4e23546dd93ef0
Author: Oleh Martushevskyi
AuthorDate: Tue Jul 2 14:51:05 2019 +0300
fixed issues
---
infrastructure-provisioning/terraform/aws/main/variables.tf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/terraform/aws/main/variables.tf
b/infrastructure-provisioning/terraform/aws/main/variables.tf
index 5032928..8d87350 100644
--- a/infrastructure-provisioning/terraform/aws/main/variables.tf
+++ b/infrastructure-provisioning/terraform/aws/main/variables.tf
@@ -111,7 +111,7 @@ variable "cluster_name" {
}
variable "slave_count" {
- default = ""
+ default = 1
}
variable "emr_template" {
@@ -127,7 +127,7 @@ variable "slave_shape" {
}
variable "instance_count" {
- default = ""
+ default = 1
}
variable "bid_price" {
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-terraform updated: fixed issues
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 349b5a9 fixed issues
349b5a9 is described below
commit 349b5a976c7ef33be3c9d94a4368820f7ab226c1
Author: Oleh Martushevskyi
AuthorDate: Tue Jul 2 14:49:35 2019 +0300
fixed issues
---
.../terraform/aws/main/main.tf | 1 +
.../terraform/aws/main/variables.tf| 82 +++---
.../terraform/aws/modules/data_engine/instance.tf | 4 +-
.../terraform/aws/modules/data_engine/variables.tf | 4 +-
.../terraform/aws/modules/notebook/instance.tf | 2 +-
.../aws/modules/ssn-k8s/auto_scaling_groups.tf | 20 +++---
6 files changed, 75 insertions(+), 38 deletions(-)
diff --git a/infrastructure-provisioning/terraform/aws/main/main.tf
b/infrastructure-provisioning/terraform/aws/main/main.tf
index 2d5b73d..d2a1a72 100644
--- a/infrastructure-provisioning/terraform/aws/main/main.tf
+++ b/infrastructure-provisioning/terraform/aws/main/main.tf
@@ -73,6 +73,7 @@ module "data_engine" {
key_name = "${var.key_name}"
cluster_name = "${var.cluster_name}"
slave_count = "${var.slave_count}"
+ ami = "${var.ami}"
}
module "emr" {
diff --git a/infrastructure-provisioning/terraform/aws/main/variables.tf
b/infrastructure-provisioning/terraform/aws/main/variables.tf
index 4490a53..5032928 100644
--- a/infrastructure-provisioning/terraform/aws/main/variables.tf
+++ b/infrastructure-provisioning/terraform/aws/main/variables.tf
@@ -43,11 +43,7 @@ variable "subnet_cidr" {
default = "172.31.0.0/24"
}
variable "ami" {
- type = "map"
- default = {
-"debian" = "ami-08692d171e3cf02d6",
-"redhat" = ""
- }
+ default = "ami-08692d171e3cf02d6"
}
variable "ssn_k8s_masters_count" {
default = 3
@@ -66,40 +62,78 @@ variable "ssn_k8s_workers_shape" {
default = "t2.medium"
}
-variable "endpoint_tag" {}
+variable "endpoint_tag" {
+ default = ""
+}
-variable "user_tag" {}
+variable "user_tag" {
+ default = ""
+}
-variable "custom_tag" {}
+variable "custom_tag" {
+ default = ""
+}
-variable "notebook_name" {}
+variable "notebook_name" {
+ default = ""
+}
-variable "product_name" {}
+variable "product_name" {
+ default = ""
+}
-variable "nb-sg_id" {}
+variable "nb-sg_id" {
+ default = ""
+}
-variable "note_profile_name" {}
+variable "note_profile_name" {
+ default = ""
+}
-variable "note_cidr_range" {}
+variable "note_cidr_range" {
+ default = ""
+}
-variable "traefik_cidr" {}
+variable "traefik_cidr" {
+ default = ""
+}
-variable "note_ami" {}
+variable "note_ami" {
+ default = ""
+}
-variable "instance_type" {}
+variable "instance_type" {
+ default = ""
+}
-variable "cluster_name" {}
+variable "cluster_name" {
+ default = ""
+}
-variable "slave_count" {}
+variable "slave_count" {
+ default = ""
+}
-variable "emr_template" {}
+variable "emr_template" {
+ default = ""
+}
-variable "master_shape" {}
+variable "master_shape" {
+ default = ""
+}
-variable "slave_shape" {}
+variable "slave_shape" {
+ default = ""
+}
-variable "instance_count" {}
+variable "instance_count" {
+ default = ""
+}
-variable "bid_price" {}
+variable "bid_price" {
+ default = ""
+}
-variable "source_instance_id" {}
\ No newline at end of file
+variable "source_instance_id" {
+ default = ""
+}
\ No newline at end of file
diff --git
a/infrastructure-provisioning/terraform/aws/modules/data_engine/instance.tf
b/infrastructure-provisioning/terraform/aws/modules/data_engine/instance.tf
index a0d9b2c..fab902b 100644
--- a/infrastructure-provisioning/terraform/aws/modules/data_engine/instance.tf
+++ b/infrastructure-provisioning/terraform/aws/modules/data_engine/instance.tf
@@ -9,7 +9,7 @@ resource "aws_instance" "master" {
key_name = "${var.key_name}"
subnet_id= "${var.subnet_id}"
security_groups = ["${var.nb-sg_id}"]
- iam_instance_profile = "${var.iam_profile_name}"
+ iam_instance_profile = "${var.note_profile_name}"
tags = {
Name = "${local.cluster_name}-m"
Type = "master"
@@ -30,7 +30,7 @@ resource "aws_instance" "slave" {
key_name = "${var.key_name}"
subnet_id= "${var.subnet_id}"
security_groups = ["${var.nb-sg_id}"]
- iam_instance_profile = "${var.iam_profile_name}"
+ iam_instance_profile = "${var.note_profile_name}"
tags = {
Name = "${local.cluster_name}-s${count.index + 1}"
Type = "slave"
diff --git
a/infrastructure-provisioning/terraform/aws/modules/data_engine/variables.tf
b/infrastructure-provisioning/terraform/aws/modules/data_engine/variables.tf
index b2e94fe..b62875f 100644
--- a/infrastructure-provisioning/terraform/aws/mo
[incubator-dlab] branch DLAB-terraform updated (5b6f9ac -> 16da59b)
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 5b6f9ac Merge pull request #132 from apache/DLAB-668 add cce204c formatted code add 17ce09b formatted code new 16da59b Merge pull request #134 from apache/DLAB-terraform-k8s 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: .../terraform/aws/main/main.tf | 40 ++--- .../terraform/aws/main/variables.tf| 66 +- .../aws/modules/ssn-k8s/auto_scaling_groups.tf | 44 +++ .../terraform/aws/modules/ssn-k8s/lb.tf| 20 +++ .../terraform/aws/modules/ssn-k8s/role_policy.tf | 26 - .../terraform/aws/modules/ssn-k8s/s3.tf| 3 +- .../aws/modules/ssn-k8s/security_groups.tf | 18 +++--- .../terraform/aws/modules/ssn-k8s/variables.tf | 10 ++-- .../terraform/aws/modules/ssn-k8s/vpc.tf | 30 +- 9 files changed, 123 insertions(+), 134 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #134 from apache/DLAB-terraform-k8s
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 16da59be75212d70b5eb3a15eb3580b8fcd241d1 Merge: 5b6f9ac 17ce09b Author: Oleh Martushevskyi AuthorDate: Tue Jul 2 14:38:16 2019 +0300 Merge pull request #134 from apache/DLAB-terraform-k8s Dlab terraform k8s .../terraform/aws/main/main.tf | 40 ++--- .../terraform/aws/main/variables.tf| 66 +- .../aws/modules/ssn-k8s/auto_scaling_groups.tf | 44 +++ .../terraform/aws/modules/ssn-k8s/lb.tf| 20 +++ .../terraform/aws/modules/ssn-k8s/role_policy.tf | 26 - .../terraform/aws/modules/ssn-k8s/s3.tf| 3 +- .../aws/modules/ssn-k8s/security_groups.tf | 18 +++--- .../terraform/aws/modules/ssn-k8s/variables.tf | 10 ++-- .../terraform/aws/modules/ssn-k8s/vpc.tf | 30 +- 9 files changed, 123 insertions(+), 134 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-terraform-k8s updated: formatted code
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-terraform-k8s
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-terraform-k8s by this
push:
new 17ce09b formatted code
17ce09b is described below
commit 17ce09bc88085029f854fcdc53de0cded3b9b099
Author: Oleh Martushevskyi
AuthorDate: Tue Jul 2 14:37:25 2019 +0300
formatted code
---
.../terraform/aws/main/main.tf | 36 ++---
.../terraform/aws/main/variables.tf| 62 +-
.../terraform/aws/modules/ssn-k8s/variables.tf | 10 ++--
3 files changed, 48 insertions(+), 60 deletions(-)
diff --git a/infrastructure-provisioning/terraform/aws/main/main.tf
b/infrastructure-provisioning/terraform/aws/main/main.tf
index b6000b0..2d5b73d 100644
--- a/infrastructure-provisioning/terraform/aws/main/main.tf
+++ b/infrastructure-provisioning/terraform/aws/main/main.tf
@@ -5,24 +5,24 @@ provider "aws" {
}
module "ssn-k8s" {
- source= "../modules/ssn-k8s"
- service_base_name = var.service_base_name
- vpc_id= var.vpc_id
- vpc_cidr = var.vpc_cidr
- subnet_id = var.subnet_id
- env_os= var.env_os
- ami = var.ami
- key_name = var.key_name
- region= var.region
- zone = var.zone
- masters_count = var.masters_count
- workers_count = var.workers_count
- root_volume_size = var.root_volume_size
- allowed_cidrs = var.allowed_cidrs
- subnet_cidr = var.subnet_cidr
- masters_shape = var.masters_shape
- workers_shape = var.workers_shape
- os-user = var.os-user
+ source= "../modules/ssn-k8s"
+ service_base_name = var.service_base_name
+ vpc_id= var.vpc_id
+ vpc_cidr = var.vpc_cidr
+ subnet_id = var.subnet_id
+ env_os= var.env_os
+ ami = var.ami
+ key_name = var.key_name
+ region= var.region
+ zone = var.zone
+ ssn_k8s_masters_count = var.ssn_k8s_masters_count
+ ssn_k8s_workers_count = var.ssn_k8s_workers_count
+ ssn_root_volume_size = var.ssn_root_volume_size
+ allowed_cidrs = var.allowed_cidrs
+ subnet_cidr = var.subnet_cidr
+ ssn_k8s_masters_shape = var.ssn_k8s_masters_shape
+ ssn_k8s_workers_shape = var.ssn_k8s_workers_shape
+ os-user = var.os-user
}
module "common" {
diff --git a/infrastructure-provisioning/terraform/aws/main/variables.tf
b/infrastructure-provisioning/terraform/aws/main/variables.tf
index cc417f7..4490a53 100644
--- a/infrastructure-provisioning/terraform/aws/main/variables.tf
+++ b/infrastructure-provisioning/terraform/aws/main/variables.tf
@@ -1,39 +1,47 @@
+// AWS info
variable "access_key_id" {}
-
variable "secret_access_key" {}
-
variable "region" {
default = "us-west-2"
}
-
variable "zone" {
default = "a"
}
+// Common
+variable "env_os" {
+ default = "debian"
+}
+variable "key_name" {
+ default = "BDCC-DSS-POC"
+}
+variable "allowed_cidrs" {
+ default = ["0.0.0.0/0"]
+}
+variable "os-user" {
+ default = "dlab-user"
+}
+
+variable "project_tag" {
+ default = ""
+}
+
+// SSN
variable "service_base_name" {
default = "k8s"
}
-
variable "vpc_id" {
default = ""
}
-
variable "vpc_cidr" {
default = "172.31.0.0/16"
}
-
variable "subnet_id" {
default = ""
}
-
variable "subnet_cidr" {
default = "172.31.0.0/24"
}
-
-variable "env_os" {
- default = "debian"
-}
-
variable "ami" {
type = "map"
default = {
@@ -41,43 +49,23 @@ variable "ami" {
"redhat" = ""
}
}
-
-variable "key_name" {
- default = "BDCC-DSS-POC"
-}
-
-variable "masters_count" {
+variable "ssn_k8s_masters_count" {
default = 3
}
-
-variable "workers_count" {
+variable "ssn_k8s_workers_count" {
default = 2
}
-
-variable "root_volume_size" {
+variable "ssn_root_volume_size" {
default = 30
}
-
-variable "allowed_cidrs" {
- default = ["0.0.0.0/0"]
-}
-
-variable "masters_shape" {
+variable "ssn_k8s_masters_shape" {
default = "t2.medium"
}
-variable "workers_shape" {
+variable "ssn_k8s_workers_shape" {
default = "t2.medium"
}
-variable "os-user" {
- default = "dlab-user"
-}
-
-variable "project_tag" {
- default = ""
-}
-
variable "endpoint_tag" {}
variable "user_tag" {}
diff --git
a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/variables.tf
b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/variables.tf
index ac20f77..f4ad7d8 100644
--- a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/variables.tf
+++ b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/variables.tf
@@ -18,16 +18,16 @@ variable "region" {}
variable "zone" {}
-variable "masters_count" {}
+variable "ssn_k8s_masters_count" {}
-variable "workers_count" {}
+v
[incubator-dlab] 01/01: formatted code
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-terraform-k8s
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit cce204cb7d9e84713c21fe04f69edf3ee048dec8
Author: Oleh Martushevskyi
AuthorDate: Tue Jul 2 13:54:39 2019 +0300
formatted code
---
.../terraform/aws/main/main.tf | 4 +-
.../terraform/aws/main/variables.tf| 4 +-
.../aws/modules/ssn-k8s/auto_scaling_groups.tf | 44 +++---
.../terraform/aws/modules/ssn-k8s/lb.tf| 20 +-
.../terraform/aws/modules/ssn-k8s/role_policy.tf | 26 ++---
.../terraform/aws/modules/ssn-k8s/s3.tf| 3 +-
.../aws/modules/ssn-k8s/security_groups.tf | 18 -
.../terraform/aws/modules/ssn-k8s/vpc.tf | 30 +++
8 files changed, 75 insertions(+), 74 deletions(-)
diff --git a/infrastructure-provisioning/terraform/aws/main/main.tf
b/infrastructure-provisioning/terraform/aws/main/main.tf
index 3d77b3c..b6000b0 100644
--- a/infrastructure-provisioning/terraform/aws/main/main.tf
+++ b/infrastructure-provisioning/terraform/aws/main/main.tf
@@ -1,7 +1,7 @@
provider "aws" {
region = var.region
- access_key = var.access_key_var
- secret_key = var.secret_key_var
+ access_key = var.access_key_id
+ secret_key = var.secret_access_key
}
module "ssn-k8s" {
diff --git a/infrastructure-provisioning/terraform/aws/main/variables.tf
b/infrastructure-provisioning/terraform/aws/main/variables.tf
index fb1c3c5..cc417f7 100644
--- a/infrastructure-provisioning/terraform/aws/main/variables.tf
+++ b/infrastructure-provisioning/terraform/aws/main/variables.tf
@@ -1,6 +1,6 @@
-variable "access_key_var" {}
+variable "access_key_id" {}
-variable "secret_key_var" {}
+variable "secret_access_key" {}
variable "region" {
default = "us-west-2"
diff --git
a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/auto_scaling_groups.tf
b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/auto_scaling_groups.tf
index 7ba0971..2e20934 100644
---
a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/auto_scaling_groups.tf
+++
b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/auto_scaling_groups.tf
@@ -1,29 +1,29 @@
-data "template_file" "k8s-masters-user-data" {
+data "template_file" "ssn_k8s_masters_user_data" {
template = file("../modules/ssn-k8s/files/masters-user-data.sh")
vars = {
k8s-asg = "${var.service_base_name}-master"
k8s-region = var.region
-k8s-bucket-name = aws_s3_bucket.k8s-bucket.id
+k8s-bucket-name = aws_s3_bucket.ssn_k8s_bucket.id
k8s-eip = aws_eip.k8s-lb-eip.public_ip
-k8s-tg-arn = aws_lb_target_group.k8s-lb-target-group.arn
+k8s-tg-arn = aws_lb_target_group.ssn_k8s_lb_target_group.arn
k8s-os-user = var.os-user
}
}
-data "template_file" "k8s-workers-user-data" {
+data "template_file" "ssn_k8s_workers_user_data" {
template = file("../modules/ssn-k8s/files/workers-user-data.sh")
vars = {
-k8s-bucket-name = aws_s3_bucket.k8s-bucket.id
+k8s-bucket-name = aws_s3_bucket.ssn_k8s_bucket.id
k8s-os-user = var.os-user
}
}
-resource "aws_launch_configuration" "as_conf_masters" {
- name = "${var.service_base_name}-as-conf-masters"
+resource "aws_launch_configuration" "ssn_k8s_launch_conf_masters" {
+ name = "${var.service_base_name}-ssn-launch-conf-masters"
image_id = var.ami[var.env_os]
instance_type= var.masters_shape
key_name = var.key_name
- security_groups = [aws_security_group.k8s-sg.id]
+ security_groups = [aws_security_group.ssn_k8s_sg.id]
iam_instance_profile = aws_iam_instance_profile.k8s-profile.name
root_block_device {
volume_type = "gp2"
@@ -34,15 +34,15 @@ resource "aws_launch_configuration" "as_conf_masters" {
lifecycle {
create_before_destroy = true
}
- user_data = data.template_file.k8s-masters-user-data.rendered
+ user_data = data.template_file.ssn_k8s_masters_user_data.rendered
}
-resource "aws_launch_configuration" "as_conf_workers" {
- name = "${var.service_base_name}-as-conf-workers"
+resource "aws_launch_configuration" "ssn_k8s_launch_conf_workers" {
+ name = "${var.service_base_name}-ssn-launch-conf-workers"
image_id = var.ami[var.env_os]
instance_type= var.workers_shape
key_name = var.key_name
- security_groups = [aws_security_group.k8s-sg.id]
+ security_groups = [aws_security_group.ssn_k8s_sg.id]
iam_instance_profile = aws_iam_instance_profile.k8s-profile.name
root_block_device {
volume_type = "gp2"
@@ -53,16 +53,16 @@ resource "aws_launch_configuration" "as_conf_workers" {
lifecycle {
create_before_destroy = true
}
- user_data = data.template_file.k8s-workers-user-data.rendered
+ user_data
[incubator-dlab] branch DLAB-terraform-k8s created (now cce204c)
This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a change to branch DLAB-terraform-k8s in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at cce204c formatted code This branch includes the following new commits: new cce204c formatted code 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. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-668 deleted (was e31002d)
This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a change to branch DLAB-668 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. was e31002d [DLAB-668] Added terraform scripts for notebooks and computational resources The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-terraform updated (4d966a2 -> 5b6f9ac)
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 4d966a2 [DLAB-667] Added terraform scripts for notebooks and computational resources add e31002d [DLAB-668] Added terraform scripts for notebooks and computational resources new 5b6f9ac Merge pull request #132 from apache/DLAB-668 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: .../terraform/gcp/main/main.tf | 88 ++ .../terraform/gcp/main/variables.tf| 55 +++ .../terraform/gcp/modules/common/iam.tf| 36 .../terraform/gcp/modules/common/network.tf| 39 .../terraform/gcp/modules/common/variables.tf | 39 .../terraform/gcp/modules/data_engine/instance.tf | 101 + .../terraform/gcp/modules/data_engine/variables.tf | 35 +++ .../terraform/gcp/modules/dataproc/instance.tf | 42 + .../terraform/gcp/modules/dataproc/variables.tf| 39 .../terraform/gcp/modules/notebook/instance.tf | 65 + .../terraform/gcp/modules/notebook/variables.tf| 29 ++ 11 files changed, 568 insertions(+) create mode 100644 infrastructure-provisioning/terraform/gcp/main/main.tf create mode 100644 infrastructure-provisioning/terraform/gcp/main/variables.tf create mode 100644 infrastructure-provisioning/terraform/gcp/modules/common/iam.tf create mode 100644 infrastructure-provisioning/terraform/gcp/modules/common/network.tf create mode 100644 infrastructure-provisioning/terraform/gcp/modules/common/variables.tf create mode 100644 infrastructure-provisioning/terraform/gcp/modules/data_engine/instance.tf create mode 100644 infrastructure-provisioning/terraform/gcp/modules/data_engine/variables.tf create mode 100644 infrastructure-provisioning/terraform/gcp/modules/dataproc/instance.tf create mode 100644 infrastructure-provisioning/terraform/gcp/modules/dataproc/variables.tf create mode 100644 infrastructure-provisioning/terraform/gcp/modules/notebook/instance.tf create mode 100644 infrastructure-provisioning/terraform/gcp/modules/notebook/variables.tf - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #132 from apache/DLAB-668
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 5b6f9acca7f43287cbe7c4e3af5ad54c5261fc7d Merge: 4d966a2 e31002d Author: Oleh Martushevskyi AuthorDate: Tue Jul 2 13:37:55 2019 +0300 Merge pull request #132 from apache/DLAB-668 [DLAB-668] Added terraform scripts for notebooks and computational resources .../terraform/gcp/main/main.tf | 88 ++ .../terraform/gcp/main/variables.tf| 55 +++ .../terraform/gcp/modules/common/iam.tf| 36 .../terraform/gcp/modules/common/network.tf| 39 .../terraform/gcp/modules/common/variables.tf | 39 .../terraform/gcp/modules/data_engine/instance.tf | 101 + .../terraform/gcp/modules/data_engine/variables.tf | 35 +++ .../terraform/gcp/modules/dataproc/instance.tf | 42 + .../terraform/gcp/modules/dataproc/variables.tf| 39 .../terraform/gcp/modules/notebook/instance.tf | 65 + .../terraform/gcp/modules/notebook/variables.tf| 29 ++ 11 files changed, 568 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch feature/projects updated (bca152a -> cb60569)
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a change to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from bca152a DLAB-830 added project statuses and possibility to terminate
project
new 97b2b4f aws - project tag added for bucket gcp - project creation,
project_prepary.py created
new 2ce490e aws - notebook creation nginx error fixed
new ed009ee aws - notebook creation bug fixed ldap_user removed
new ab6f5e7 aws - edge stop/start/status returned
new cb60569 Merge pull request #131 from bodnarmykola/DLAB-748
The 6238 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:
infrastructure-provisioning/src/edge/fabfile.py| 147 ++---
.../src/general/lib/os/debian/edge_lib.py | 4 +-
.../src/general/lib/os/redhat/edge_lib.py | 4 +-
.../src/general/scripts/aws/project_prepare.py | 6 +
.../src/general/scripts/aws/ssn_configure.py | 1 +
.../gcp/{edge_prepare.py => project_prepare.py}| 106 +++
.../src/general/scripts/gcp/ssn_configure.py | 2 +-
.../scripts/configure_nginx_reverse_proxy.py | 17 ++-
.../src/project/templates/nginx.conf | 20 +--
9 files changed, 154 insertions(+), 153 deletions(-)
copy infrastructure-provisioning/src/general/scripts/gcp/{edge_prepare.py =>
project_prepare.py} (81%)
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-668 created (now e31002d)
This is an automated email from the ASF dual-hosted git repository. dmysakovets pushed a change to branch DLAB-668 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at e31002d [DLAB-668] Added terraform scripts for notebooks and computational resources This branch includes the following new commits: new e31002d [DLAB-668] Added terraform scripts for notebooks and computational resources 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. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-668] Added terraform scripts for notebooks and computational resources
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch DLAB-668
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit e31002d1d3b9208a17be85deab706fbdc5c15e0e
Author: Dyoma33
AuthorDate: Tue Jul 2 11:19:07 2019 +0300
[DLAB-668] Added terraform scripts for notebooks and computational resources
---
.../terraform/gcp/main/main.tf | 88 ++
.../terraform/gcp/main/variables.tf| 55 +++
.../terraform/gcp/modules/common/iam.tf| 36
.../terraform/gcp/modules/common/network.tf| 39
.../terraform/gcp/modules/common/variables.tf | 39
.../terraform/gcp/modules/data_engine/instance.tf | 101 +
.../terraform/gcp/modules/data_engine/variables.tf | 35 +++
.../terraform/gcp/modules/dataproc/instance.tf | 42 +
.../terraform/gcp/modules/dataproc/variables.tf| 39
.../terraform/gcp/modules/notebook/instance.tf | 65 +
.../terraform/gcp/modules/notebook/variables.tf| 29 ++
11 files changed, 568 insertions(+)
diff --git a/infrastructure-provisioning/terraform/gcp/main/main.tf
b/infrastructure-provisioning/terraform/gcp/main/main.tf
new file mode 100644
index 000..3cbca78
--- /dev/null
+++ b/infrastructure-provisioning/terraform/gcp/main/main.tf
@@ -0,0 +1,88 @@
+provider "google" {
+ credentials = "${var.credentials}"
+ project = "${var.project_name}"
+ region = "${var.region_var}"
+ zone= "${var.zone_var}"
+}
+
+module "common" {
+ source= "../modules/common"
+ project_tag = "${var.project_tag}"
+ endpoint_tag = "${var.endpoint_tag}"
+ user_tag = "${var.user_tag}"
+ custom_tag= "${var.custom_tag}"
+ product = "${var.product_name}"
+ region= "${var.region_var}"
+ vpc_name = "${var.vpc_name}"
+ fw_ingress= "${var.fw_ingress}"
+ fw_egress_public = "${var.fw_egress_public}"
+ fw_egress_private = "${var.fw_egress_private}"
+ network_tag = "${var.network_tag}"
+ cidr_range= "${var.cidr_range}"
+ traefik_cidr = "${var.traefik_cidr}"
+}
+
+module "notebook" {
+ source = "../modules/notebook"
+ project_tag = "${var.project_tag}"
+ endpoint_tag= "${var.endpoint_tag}"
+ user_tag= "${var.user_tag}"
+ custom_tag = "${var.custom_tag}"
+ product = "${var.product_name}"
+ notebook_name = "${var.notebook_name}"
+ zone_var= "${var.zone_var}"
+ vpc_name= "${var.vpc_name}"
+ subnet_name = "${var.subnet_name}"
+ network_tag = "${var.network_tag}"
+ sa_email= "${var.sa_email}"
+ ami = "${var.ami}"
+ machine_type= "${var.machine_type}"
+ ssh_key = "${var.ssh_key}"
+ gpu_accelerator = "${var.gpu_accelerator}"
+}
+
+module "data_engine" {
+ source = "../modules/data_engine"
+ project_tag = "${var.project_tag}"
+ endpoint_tag= "${var.endpoint_tag}"
+ user_tag= "${var.user_tag}"
+ custom_tag = "${var.custom_tag}"
+ product = "${var.product_name}"
+ notebook_name = "${var.notebook_name}"
+ zone_var= "${var.zone_var}"
+ vpc_name= "${var.vpc_name}"
+ subnet_name = "${var.subnet_name}"
+ network_tag = "${var.network_tag}"
+ sa_email= "${var.sa_email}"
+ ami = "${var.ami}"
+ ssh_key = "${var.ssh_key}"
+ gpu_accelerator = "${var.gpu_accelerator}"
+ cluster_name= "${var.cluster_name}"
+ total_count = "${var.total_count}"
+ master_shape= "${var.master_shape}"
+ slave_shape = "${var.slave_shape}"
+}
+
+module "dataproc" {
+ source= "../modules/dataproc"
+ region= "${var.region_var}"
+ project_tag = "${var.project_tag}"
+ endpoint_tag = "${var.endpoint_tag}"
+ user_tag = "${var.user_tag}"
+ custom_tag= "${var.custom_tag}"
+ product = "${var.product_name}"
+ notebook_name = "${var.notebook_name}"
+ zone_var = "${var.zone_var}"
+ vpc_name = "${var.vpc_name}"
+ subnet_name = "${var.subnet_name}"
+ network_tag = "${var.network_tag}"
+ sa_email = "${var.sa_email}"
+ ami = "${var.ami}"
+ ssh_key = "${var.ssh_key}"
+ gpu_accelerator = "${var.gpu_accelerator}"
+ cluster_name = "${var.cluster_name}"
+ total_count = "${var.total_count}"
+ master_shape = "${var.master_shape}"
+ slave_shape = "${var.slave_shape}"
+ preemptible_count = "${var.preemptible_count}"
+}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/gcp/main/variables.tf
b/infrastructure-provisioning/terraform/gcp/main/variables.tf
new file mode 100644
index 000..2b328ee
--- /dev/null
+++ b/infrastructure-provisioning/terraform/gcp/main/variables.tf
@@ -0,0 +1
