[incubator-dlab] 01/01: Merge pull request #301 from apache/fix-dataproc
This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit fe5e433c72d217447878febd6156d60f04bd3ed4 Merge: 9821a56 c1663b0 Author: Oleh Martushevskyi AuthorDate: Thu Sep 12 17:46:49 2019 +0300 Merge pull request #301 from apache/fix-dataproc [DLAB-1090]: Fixed name of primary disk for dataproc infrastructure-provisioning/src/general/lib/gcp/actions_lib.py | 8 1 file changed, 4 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (9821a56 -> fe5e433)
This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 9821a56 Merge pull request #296 from apache/DLAB-1090 add c1663b0 [DLAB-1090]:Fixed name of primary disk for dataproc. new fe5e433 Merge pull request #301 from apache/fix-dataproc 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/general/lib/gcp/actions_lib.py | 8 1 file changed, 4 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch fix-dataproc deleted (was c1663b0)
This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a change to branch fix-dataproc in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. was c1663b0 [DLAB-1090]:Fixed name of primary disk for dataproc. 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 fix-dataproc created (now c1663b0)
This is an automated email from the ASF dual-hosted git repository. adamsd pushed a change to branch fix-dataproc in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at c1663b0 [DLAB-1090]:Fixed name of primary disk for dataproc. This branch includes the following new commits: new c1663b0 [DLAB-1090]:Fixed name of primary disk for dataproc. 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-1090]:Fixed name of primary disk for dataproc.
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch fix-dataproc
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit c1663b05d6b05403d90f47b9fa96acee46561d88
Author: AdamsDisturber
AuthorDate: Thu Sep 12 17:42:27 2019 +0300
[DLAB-1090]:Fixed name of primary disk for dataproc.
---
infrastructure-provisioning/src/general/lib/gcp/actions_lib.py | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
index 6b405a6..cdbae10 100644
--- a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
@@ -854,13 +854,13 @@ class GCPActions:
slave_instances =
cluster.get('config').get('workerConfig').get('instanceNames')
for instance in master_instances:
param = {}
-param['name'] = instance
-param['tag_name'] = instance + '-volume-primary'
+param['name'] = clusteName
+param['tag_name'] = clusteName + '-volume-primary'
dataproc_instances.append(param)
for instance in slave_instances:
param = {}
-param['name'] = instance
-param['tag_name'] = instance + '-volume-primary'
+param['name'] = clusteName
+param['tag_name'] = clusteName + '-volume-primary'
dataproc_instances.append(param)
GCPActions().set_disks_tag(dataproc_instances, zone, labels)
except Exception as err:
-
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 #296 from apache/DLAB-1090
This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 9821a560720b0383de0a3352ed36c1b3170055c6 Merge: 864c4db 8032f1f Author: Oleh Martushevskyi AuthorDate: Thu Sep 12 17:40:18 2019 +0300 Merge pull request #296 from apache/DLAB-1090 [DLAB-1090] Include EMR disk name cluster_name, instead of instance_name on GCP. .../src/general/lib/gcp/actions_lib.py | 21 + .../general/scripts/gcp/common_create_instance.py | 4 +++- .../src/general/scripts/gcp/dataengine_prepare.py | 13 + 3 files changed, 29 insertions(+), 9 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1090 deleted (was 8032f1f)
This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a change to branch DLAB-1090 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. was 8032f1f minor fix 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 develop updated (864c4db -> 9821a56)
This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 864c4db Merge pull request #300 from apache/DLAB-1037 add a555c58 [DLAB-1090] Include EMR disk name cluster_name, instead of instance_name on GCP. add 8032f1f minor fix new 9821a56 Merge pull request #296 from apache/DLAB-1090 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: .../src/general/lib/gcp/actions_lib.py | 21 + .../general/scripts/gcp/common_create_instance.py | 4 +++- .../src/general/scripts/gcp/dataengine_prepare.py | 13 + 3 files changed, 29 insertions(+), 9 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch gcp-dataengine created (now e31a24c)
This is an automated email from the ASF dual-hosted git repository. adamsd pushed a change to branch gcp-dataengine in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at e31a24c [DLAB-1090]:Fixed name of primary disk for dataproc. This branch includes the following new commits: new e31a24c [DLAB-1090]:Fixed name of primary disk for dataproc. 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-1090]:Fixed name of primary disk for dataproc.
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch gcp-dataengine
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit e31a24c9d8af2774868416db35531ba951823e86
Author: AdamsDisturber
AuthorDate: Thu Sep 12 17:28:28 2019 +0300
[DLAB-1090]:Fixed name of primary disk for dataproc.
---
infrastructure-provisioning/src/general/lib/gcp/actions_lib.py | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
index 6b405a6..cdbae10 100644
--- a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
@@ -854,13 +854,13 @@ class GCPActions:
slave_instances =
cluster.get('config').get('workerConfig').get('instanceNames')
for instance in master_instances:
param = {}
-param['name'] = instance
-param['tag_name'] = instance + '-volume-primary'
+param['name'] = clusteName
+param['tag_name'] = clusteName + '-volume-primary'
dataproc_instances.append(param)
for instance in slave_instances:
param = {}
-param['name'] = instance
-param['tag_name'] = instance + '-volume-primary'
+param['name'] = clusteName
+param['tag_name'] = clusteName + '-volume-primary'
dataproc_instances.append(param)
GCPActions().set_disks_tag(dataproc_instances, zone, labels)
except Exception as err:
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1086 updated: fixed issue with Load Balancer IP
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1086
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1086 by this push:
new 71bd9b5 fixed issue with Load Balancer IP
71bd9b5 is described below
commit 71bd9b578c3a14e9e40fe2fd30bd357cf2ffe185
Author: Oleh Martushevskyi
AuthorDate: Thu Sep 12 17:20:37 2019 +0300
fixed issue with Load Balancer IP
---
.../terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf | 2 +-
.../terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf | 4 ++--
.../terraform/gcp/ssn-gke/main/modules/helm_charts/nginx.tf| 7 +++
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf
index e776fb4..43d3d19 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf
@@ -26,7 +26,7 @@ data "template_file" "dlab_ui_values" {
mongo_user = var.mongo_db_username
mongo_port = var.mongo_service_port
mongo_service_name = var.mongo_service_name
- ssn_k8s_alb_dns_name = var.ssn_k8s_alb_dns_name
+ ssn_k8s_alb_dns_name =
data.kubernetes_service.nginx_service.load_balancer_ingress.0.ip
provision_service_host = "127.0.0.1" # var.endpoint_eip_address
env_os = var.env_os
service_base_name = var.service_base_name
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf
index e92f2f7..2398b13 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf
@@ -22,7 +22,7 @@
data "template_file" "configure_keycloak" {
template = file("./modules/helm_charts/files/configure_keycloak.sh")
vars = {
-ssn_k8s_alb_dns_name = var.ssn_k8s_alb_dns_name
+ssn_k8s_alb_dns_name =
data.kubernetes_service.nginx_service.load_balancer_ingress.0.ip
keycloak_user = var.keycloak_user
keycloak_password = random_string.keycloak_password.result
keycloak_client_secret = random_uuid.keycloak_client_secret.result
@@ -42,7 +42,7 @@ data "template_file" "keycloak_values" {
vars = {
keycloak_user = var.keycloak_user
keycloak_password = random_string.keycloak_password.result
-ssn_k8s_alb_dns_name= var.ssn_k8s_alb_dns_name
+ssn_k8s_alb_dns_name=
data.kubernetes_service.nginx_service.load_balancer_ingress.0.ip
configure_keycloak_file = data.template_file.configure_keycloak.rendered
mysql_db_name = var.mysql_db_name
mysql_user = var.mysql_user
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/nginx.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/nginx.tf
index 1ce1413..dec98ea 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/nginx.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/nginx.tf
@@ -28,3 +28,10 @@ resource "helm_release" "nginx" {
file("./modules/helm_charts/files/nginx_values.yaml")
]
}
+
+data "kubernetes_service" "nginx_service" {
+metadata {
+name = "${helm_release.nginx.name}-controller"
+}
+depends_on = [helm_release.nginx]
+}
\ No newline at end of file
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (852175f -> 864c4db)
This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 852175f Merge pull request #294 from ofuks/DLAB-1054 add df48bb4 [DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to different subnets add 864c4db Merge pull request #300 from apache/DLAB-1037 No new revisions were added by this update. Summary of changes: .../src/general/scripts/aws/common_prepare_notebook.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1037 deleted (was df48bb4)
This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a change to branch DLAB-1037 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. was df48bb4 [DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to different subnets 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-1037]: Notebook creation fails in case of allocating the same CIDR to different subnets
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch DLAB-1037
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit df48bb423150777c51dee2f6ea25997eae83e7bd
Author: AdamsDisturber
AuthorDate: Thu Sep 12 16:19:56 2019 +0300
[DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to
different subnets
---
.../src/general/scripts/aws/common_prepare_notebook.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
index 6d3de38..64d13e8 100644
---
a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
+++
b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
@@ -118,7 +118,8 @@ if __name__ == "__main__":
params = "--node_name {} --ami_id {} --instance_type {} --key_name {}
--security_group_ids {} --subnet_id {} --iam_profile {} --infra_tag_name {}
--infra_tag_value {} --instance_class {} --instance_disk_size {}
--primary_disk_size {}" \
.format(notebook_config['instance_name'],
notebook_config['ami_id'], notebook_config['instance_type'],
notebook_config['key_name'],
get_security_group_by_name(notebook_config['security_group_name']),
-get_subnet_by_cidr(notebook_config['subnet_cidr']),
notebook_config['role_profile_name'],
+get_subnet_by_cidr(notebook_config['subnet_cidr'],
os.environ['aws_notebook_vpc_id']),
+notebook_config['role_profile_name'],
notebook_config['tag_name'],
notebook_config['instance_name'], instance_class,
os.environ['notebook_disk_size'],
notebook_config['primary_disk_size'])
try:
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1037 created (now df48bb4)
This is an automated email from the ASF dual-hosted git repository. adamsd pushed a change to branch DLAB-1037 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at df48bb4 [DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to different subnets This branch includes the following new commits: new df48bb4 [DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to different subnets 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-1037 deleted (was 2f8baf5)
This is an automated email from the ASF dual-hosted git repository. adamsd pushed a change to branch DLAB-1037 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. was 2f8baf5 [DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to different subnets This change permanently discards the following revisions: discard 2f8baf5 [DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to different subnets discard 323cdf0 Merge remote-tracking branch 'origin/develop' into develop discard 6f4462a Merge remote-tracking branch 'origin/develop' into develop - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/03: Merge remote-tracking branch 'origin/develop' into develop
This is an automated email from the ASF dual-hosted git repository. adamsd pushed a commit to branch DLAB-1037 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 6f4462a2852a060621778edb786a00d542a2eea7 Merge: e3f7dd7 7e07166 Author: AdamsDisturber AuthorDate: Tue Sep 10 16:42:38 2019 +0300 Merge remote-tracking branch 'origin/develop' into develop .../src/general/lib/os/debian/common_lib.py| 54 +++--- .../scripts/aws/tensor-rstudio_configure.py| 2 +- .../epam/dlab/backendapi/dao/SchedulerJobDAO.java | 2 +- .../management/endpoints/endpoints.component.scss | 17 +++ .../manage-environment-dilog.component.html| 4 +- .../administration/project/project.component.ts| 3 +- .../src/app/core/services/userResource.service.ts | 4 +- .../webapp/src/app/core/util/checkUtils.ts | 2 +- .../create-environment.component.html | 2 +- .../create-environment.component.scss | 6 +++ .../create-environment.component.ts| 2 +- .../resources-grid/resources-grid.component.scss | 13 ++ .../resources-grid/resources-grid.component.ts | 4 +- .../confirmation-dialog.component.ts | 13 +++--- .../resources/webapp/src/assets/styles/_theme.scss | 17 ++- .../webapp/src/dictionary/aws.dictionary.ts| 4 +- .../webapp/src/dictionary/azure.dictionary.ts | 4 +- .../webapp/src/dictionary/gcp.dictionary.ts| 4 +- 18 files changed, 86 insertions(+), 71 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 02/03: Merge remote-tracking branch 'origin/develop' into develop
This is an automated email from the ASF dual-hosted git repository. adamsd pushed a commit to branch DLAB-1037 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 323cdf08d301067eb929f382993d2035025288e7 Merge: 6f4462a 852175f Author: AdamsDisturber AuthorDate: Thu Sep 12 15:22:46 2019 +0300 Merge remote-tracking branch 'origin/develop' into develop .../main/java/com/epam/dlab/model/exploratory/Image.java | 1 + .../com/epam/dlab/backendapi/dao/ImageExploratoryDao.java | 2 +- .../epam/dlab/backendapi/dao/ImageExploratoryDaoImpl.java | 15 --- .../backendapi/resources/ImageExploratoryResource.java| 8 +--- .../dlab/backendapi/resources/dto/ImageInfoRecord.java| 1 + .../dlab/backendapi/service/ImageExploratoryService.java | 2 +- .../service/impl/ImageExploratoryServiceImpl.java | 8 +--- .../resources/ImageExploratoryResourceTest.java | 12 +++- .../service/impl/ImageExploratoryServiceImplTest.java | 8 9 files changed, 33 insertions(+), 24 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 03/03: [DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to different subnets
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch DLAB-1037
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 2f8baf59aca3810b26d731ab2411cea2cf156879
Author: AdamsDisturber
AuthorDate: Thu Sep 12 16:09:30 2019 +0300
[DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to
different subnets
---
.../src/general/scripts/aws/common_prepare_notebook.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
index 6d3de38..64d13e8 100644
---
a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
+++
b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
@@ -118,7 +118,8 @@ if __name__ == "__main__":
params = "--node_name {} --ami_id {} --instance_type {} --key_name {}
--security_group_ids {} --subnet_id {} --iam_profile {} --infra_tag_name {}
--infra_tag_value {} --instance_class {} --instance_disk_size {}
--primary_disk_size {}" \
.format(notebook_config['instance_name'],
notebook_config['ami_id'], notebook_config['instance_type'],
notebook_config['key_name'],
get_security_group_by_name(notebook_config['security_group_name']),
-get_subnet_by_cidr(notebook_config['subnet_cidr']),
notebook_config['role_profile_name'],
+get_subnet_by_cidr(notebook_config['subnet_cidr'],
os.environ['aws_notebook_vpc_id']),
+notebook_config['role_profile_name'],
notebook_config['tag_name'],
notebook_config['instance_name'], instance_class,
os.environ['notebook_disk_size'],
notebook_config['primary_disk_size'])
try:
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1037 created (now 2f8baf5)
This is an automated email from the ASF dual-hosted git repository. adamsd pushed a change to branch DLAB-1037 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 2f8baf5 [DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to different subnets This branch includes the following new commits: new 6f4462a Merge remote-tracking branch 'origin/develop' into develop new 323cdf0 Merge remote-tracking branch 'origin/develop' into develop new 2f8baf5 [DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to different subnets The 3 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-1037 deleted (was fdb88bd)
This is an automated email from the ASF dual-hosted git repository. adamsd pushed a change to branch DLAB-1037 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. was fdb88bd [DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to different subnets This change permanently discards the following revisions: discard fdb88bd [DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to different subnets discard 323cdf0 Merge remote-tracking branch 'origin/develop' into develop discard 6f4462a Merge remote-tracking branch 'origin/develop' into develop - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 02/03: Merge remote-tracking branch 'origin/develop' into develop
This is an automated email from the ASF dual-hosted git repository. adamsd pushed a commit to branch DLAB-1037 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 323cdf08d301067eb929f382993d2035025288e7 Merge: 6f4462a 852175f Author: AdamsDisturber AuthorDate: Thu Sep 12 15:22:46 2019 +0300 Merge remote-tracking branch 'origin/develop' into develop .../main/java/com/epam/dlab/model/exploratory/Image.java | 1 + .../com/epam/dlab/backendapi/dao/ImageExploratoryDao.java | 2 +- .../epam/dlab/backendapi/dao/ImageExploratoryDaoImpl.java | 15 --- .../backendapi/resources/ImageExploratoryResource.java| 8 +--- .../dlab/backendapi/resources/dto/ImageInfoRecord.java| 1 + .../dlab/backendapi/service/ImageExploratoryService.java | 2 +- .../service/impl/ImageExploratoryServiceImpl.java | 8 +--- .../resources/ImageExploratoryResourceTest.java | 12 +++- .../service/impl/ImageExploratoryServiceImplTest.java | 8 9 files changed, 33 insertions(+), 24 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 03/03: [DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to different subnets
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch DLAB-1037
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit fdb88bd066ae018a027cee0df8a9a12e6708c598
Author: AdamsDisturber
AuthorDate: Thu Sep 12 16:04:58 2019 +0300
[DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to
different subnets
---
.../src/general/scripts/aws/common_prepare_notebook.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
index 6d3de38..64d13e8 100644
---
a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
+++
b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
@@ -118,7 +118,8 @@ if __name__ == "__main__":
params = "--node_name {} --ami_id {} --instance_type {} --key_name {}
--security_group_ids {} --subnet_id {} --iam_profile {} --infra_tag_name {}
--infra_tag_value {} --instance_class {} --instance_disk_size {}
--primary_disk_size {}" \
.format(notebook_config['instance_name'],
notebook_config['ami_id'], notebook_config['instance_type'],
notebook_config['key_name'],
get_security_group_by_name(notebook_config['security_group_name']),
-get_subnet_by_cidr(notebook_config['subnet_cidr']),
notebook_config['role_profile_name'],
+get_subnet_by_cidr(notebook_config['subnet_cidr'],
os.environ['aws_notebook_vpc_id']),
+notebook_config['role_profile_name'],
notebook_config['tag_name'],
notebook_config['instance_name'], instance_class,
os.environ['notebook_disk_size'],
notebook_config['primary_disk_size'])
try:
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/03: Merge remote-tracking branch 'origin/develop' into develop
This is an automated email from the ASF dual-hosted git repository. adamsd pushed a commit to branch DLAB-1037 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 6f4462a2852a060621778edb786a00d542a2eea7 Merge: e3f7dd7 7e07166 Author: AdamsDisturber AuthorDate: Tue Sep 10 16:42:38 2019 +0300 Merge remote-tracking branch 'origin/develop' into develop .../src/general/lib/os/debian/common_lib.py| 54 +++--- .../scripts/aws/tensor-rstudio_configure.py| 2 +- .../epam/dlab/backendapi/dao/SchedulerJobDAO.java | 2 +- .../management/endpoints/endpoints.component.scss | 17 +++ .../manage-environment-dilog.component.html| 4 +- .../administration/project/project.component.ts| 3 +- .../src/app/core/services/userResource.service.ts | 4 +- .../webapp/src/app/core/util/checkUtils.ts | 2 +- .../create-environment.component.html | 2 +- .../create-environment.component.scss | 6 +++ .../create-environment.component.ts| 2 +- .../resources-grid/resources-grid.component.scss | 13 ++ .../resources-grid/resources-grid.component.ts | 4 +- .../confirmation-dialog.component.ts | 13 +++--- .../resources/webapp/src/assets/styles/_theme.scss | 17 ++- .../webapp/src/dictionary/aws.dictionary.ts| 4 +- .../webapp/src/dictionary/azure.dictionary.ts | 4 +- .../webapp/src/dictionary/gcp.dictionary.ts| 4 +- 18 files changed, 86 insertions(+), 71 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1037 created (now fdb88bd)
This is an automated email from the ASF dual-hosted git repository. adamsd pushed a change to branch DLAB-1037 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at fdb88bd [DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to different subnets This branch includes the following new commits: new 6f4462a Merge remote-tracking branch 'origin/develop' into develop new 323cdf0 Merge remote-tracking branch 'origin/develop' into develop new fdb88bd [DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to different subnets The 3 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-1086 updated: fixed issue with Keycloak ingress
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1086
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1086 by this push:
new 705a43f fixed issue with Keycloak ingress
705a43f is described below
commit 705a43f2f98c3f0bd0a846ec5b230e236fa82dcd
Author: Oleh Martushevskyi
AuthorDate: Thu Sep 12 13:50:29 2019 +0300
fixed issue with Keycloak ingress
---
.../terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf | 5 +
1 file changed, 5 insertions(+)
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf
index b830165..e92f2f7 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf
@@ -72,6 +72,11 @@ resource "helm_release" "keycloak" {
resource "kubernetes_ingress" "keycloak_ingress" {
metadata {
name = "keycloak"
+annotations = {
+ "kubernetes.io/ingress.class": "nginx"
+ "nginx.ingress.kubernetes.io/ssl-redirect": "false"
+ "nginx.ingress.kubernetes.io/rewrite-target": "/auth"
+}
}
spec {
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1086 updated: fixed typo
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1086
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1086 by this push:
new 4e05ae9 fixed typo
4e05ae9 is described below
commit 4e05ae9beb60a8ccff7b6adef37641cbf998546e
Author: Oleh Martushevskyi
AuthorDate: Thu Sep 12 13:24:25 2019 +0300
fixed typo
---
.../modules/helm_charts/files/keycloak_values.yaml | 2 +-
.../ssn-gke/main/modules/helm_charts/keycloak.tf | 27 ++
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/keycloak_values.yaml
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/keycloak_values.yaml
index 6174e4a..848f5e1 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/keycloak_values.yaml
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/keycloak_values.yaml
@@ -38,7 +38,7 @@ keycloak:
# nodePort: 31088
ingress:
-enabled: true
+enabled: false
hosts: []
annotations:
kubernetes.io/ingress.class: nginx
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf
index 39800c8..b830165 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf
@@ -67,4 +67,31 @@ resource "helm_release" "keycloak" {
data.template_file.keycloak_values.rendered
]
depends_on = [helm_release.keycloak-mysql,
kubernetes_secret.keycloak_password_secret]
+}
+
+resource "kubernetes_ingress" "keycloak_ingress" {
+ metadata {
+name = "keycloak"
+ }
+
+ spec {
+backend {
+ service_name = "${helm_release.keycloak.name}-http"
+ service_port = 80
+}
+
+rule {
+ http {
+path {
+ backend {
+service_name = "${helm_release.keycloak.name}-http"
+service_port = 80
+ }
+
+ path = "/auth"
+}
+ }
+}
+ }
+ depends_on = [helm_release.keycloak]
}
\ No newline at end of file
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1086 updated: fixed typo
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1086
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1086 by this push:
new b2c4015 fixed typo
b2c4015 is described below
commit b2c401541dfae30733b5185a703cd8e1dd55f53a
Author: Oleh Martushevskyi
AuthorDate: Thu Sep 12 12:40:35 2019 +0300
fixed typo
---
.../main/modules/helm_charts/dlab-ui-chart/templates/service.yaml | 1 -
.../ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml| 2 +-
.../ssn-gke/main/modules/helm_charts/files/keycloak_values.yaml | 5 +++--
.../gcp/ssn-gke/main/modules/helm_charts/files/nginx_values.yaml | 8
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/service.yaml
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/service.yaml
index 87fb9a8..86c35dc 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/service.yaml
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/service.yaml
@@ -36,7 +36,6 @@ spec:
name: http
- port: {{ .Values.ui.service.https_port }}
targetPort: {{ .Values.ui.service.https_port }}
- nodePort: 30433
protocol: TCP
name: https
selector:
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml
index d013969..b158ebd 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml
@@ -32,7 +32,7 @@ ui:
tag: '0.1-gcp'
pullPolicy: Always
service:
-type: NodePort
+type: ClusterIP
# port: 58443
http_port: 58080
https_port: 58443
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/keycloak_values.yaml
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/keycloak_values.yaml
index 4a12917..6174e4a 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/keycloak_values.yaml
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/keycloak_values.yaml
@@ -34,11 +34,12 @@ keycloak:
dbPassword: "${mysql_user_password}"
service:
-type: NodePort
-nodePort: 31088
+type: ClusterIP
+# nodePort: 31088
ingress:
enabled: true
+hosts: []
annotations:
kubernetes.io/ingress.class: nginx
nginx.ingress.kubernetes.io/ssl-redirect: "false"
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/nginx_values.yaml
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/nginx_values.yaml
index a4ac2f0..60a6fbf 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/nginx_values.yaml
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/nginx_values.yaml
@@ -21,7 +21,7 @@
controller:
service:
-nodePorts:
- http: 31080
- https: 31443
-type: NodePort
\ No newline at end of file
+#nodePorts:
+# http: 31080
+# https: 31443
+type: LoadBalancer
\ No newline at end of file
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (7e07166 -> 852175f)
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 7e07166 Merge pull request #297 from apache/DLAB-1066 new 0c36b2a [DLAB-1054]: Added possibility to retrieve custom images per project new e611e76 Added space new 5e5ded1 Code review new 852175f Merge pull request #294 from ofuks/DLAB-1054 The 6688 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/java/com/epam/dlab/model/exploratory/Image.java | 1 + .../com/epam/dlab/backendapi/dao/ImageExploratoryDao.java | 2 +- .../epam/dlab/backendapi/dao/ImageExploratoryDaoImpl.java | 15 --- .../backendapi/resources/ImageExploratoryResource.java| 8 +--- .../dlab/backendapi/resources/dto/ImageInfoRecord.java| 1 + .../dlab/backendapi/service/ImageExploratoryService.java | 2 +- .../service/impl/ImageExploratoryServiceImpl.java | 8 +--- .../resources/ImageExploratoryResourceTest.java | 12 +++- .../service/impl/ImageExploratoryServiceImplTest.java | 8 9 files changed, 33 insertions(+), 24 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 #298 from apache/bil-devops
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a commit to branch bil-2 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 8d4a972d0f9e8ae73e74ca58ea203e3d6a42d2fb Merge: b2ccd81 e319c0e Author: bhliva AuthorDate: Thu Sep 12 11:05:49 2019 +0300 Merge pull request #298 from apache/bil-devops Bil devops infrastructure-provisioning/scripts/deploy_dlab.py | 2 + .../src/general/lib/os/debian/ssn_lib.py | 36 +++--- .../src/general/lib/os/redhat/ssn_lib.py | 78 -- .../src/general/scripts/gcp/ssn_configure.py | 8 ++- .../src/ssn/scripts/configure_billing.py | 5 ++ .../src/ssn/scripts/configure_ui.py| 10 ++- .../src/ssn/templates/supervisor_svc.conf | 12 +++- services/billing-gcp/billing.yml | 6 +- .../webapp/src/dictionary/global.dictionary.ts | 4 +- 9 files changed, 133 insertions(+), 28 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
