You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by lf...@apache.org on 2020/03/26 13:51:31 UTC
[incubator-dlab] branch DLAB-1655 created (now 7609e52)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DLAB-1655
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 7609e52 [DLAB-1655]: added gcs-connector version to dlab.ini
This branch includes the following new commits:
new 83a66f5 [DLAB-1665]: added project specific image removal during image termination for azure
new fdc5776 Merge branch 'develop' of https://github.com/apache/incubator-dlab into develop
new 5d110f8 Merge branch 'develop' of https://github.com/apache/incubator-dlab into develop
new 21d60ee [DLAB-1655]: changed gcs-connector version
new 7609e52 [DLAB-1655]: added gcs-connector version to dlab.ini
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.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 03/05: Merge branch 'develop' of
https://github.com/apache/incubator-dlab into develop
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1655
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 5d110f8a659b59601aa17cd29771d33c41fc98fa
Merge: fdc5776 dab906f
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Mar 26 15:42:19 2020 +0200
Merge branch 'develop' of https://github.com/apache/incubator-dlab into develop
.../scripts/gcp/common_terminate_notebook.py | 2 +-
.../epam/dlab/backendapi/dao/UserRoleDaoImpl.java | 2 +
.../dlab/backendapi/resources/dto/UserRoleDto.java | 2 +
.../src/main/resources/mongo/aws/mongo_roles.json | 28 +++++++++
.../main/resources/mongo/azure/mongo_roles.json | 23 +++++++
.../src/main/resources/mongo/gcp/mongo_roles.json | 26 ++++++++
.../management/management.component.ts | 70 +++++++++++-----------
.../app/administration/roles/roles.component.ts | 9 +--
.../services/applicationServiceFacade.service.ts | 6 --
.../src/app/core/services/project.service.ts | 9 ---
.../multi-level-select-dropdown.component.html | 26 +++++++-
.../multi-level-select-dropdown.component.scss | 4 +-
.../multi-level-select-dropdown.component.ts | 39 +++++++++++-
.../webapp/src/assets/styles/_dialogs.scss | 1 +
14 files changed, 189 insertions(+), 58 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/05: [DLAB-1665]: added project specific image
removal during image termination for azure
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1655
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 83a66f5451fda8e0c5d38931fb2818906213af08
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Tue Mar 24 18:03:15 2020 +0200
[DLAB-1665]: added project specific image removal during image termination for azure
---
.../src/general/scripts/azure/project_terminate.py | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/infrastructure-provisioning/src/general/scripts/azure/project_terminate.py b/infrastructure-provisioning/src/general/scripts/azure/project_terminate.py
index 7354c3d..68fd89c 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/project_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/project_terminate.py
@@ -112,6 +112,16 @@ def terminate_edge_node(resource_group_name, service_base_name, project_tag, sub
dlab.fab.append_result("Failed to remove Data Lake.", str(err))
sys.exit(1)
+ print("Removing project specific images")
+ try:
+ for image in AzureMeta.list_images():
+ if service_base_name == image.tags["SBN"] and project_tag == image.tags["project_tag"]:
+ AzureActions.remove_image(resource_group_name, image.name)
+ print("Image {} has been removed".format(image.name))
+ except Exception as err:
+ dlab.fab.append_result("Failed to remove images", str(err))
+ sys.exit(1)
+
print("Removing security groups")
try:
for sg in AzureMeta.network_client.network_security_groups.list(resource_group_name):
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/05: Merge branch 'develop' of
https://github.com/apache/incubator-dlab into develop
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1655
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit fdc57761bc0012263bef5bf85b40747684eafac8
Merge: 83a66f5 c5fb923
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Mar 25 12:38:16 2020 +0200
Merge branch 'develop' of https://github.com/apache/incubator-dlab into develop
.../general/scripts/aws/common_prepare_notebook.py | 6 ++--
.../scripts/azure/common_prepare_notebook.py | 6 ++--
.../administration/project/project.component.html | 3 +-
.../administration/project/project.component.ts | 37 ++++++++++++++++++++--
.../src/app/reporting/reporting.component.ts | 1 -
.../ami-create-dialog.component.html | 4 +--
.../notification-dialog.component.ts | 36 +++++++++++++++++++--
7 files changed, 77 insertions(+), 16 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 05/05: [DLAB-1655]: added gcs-connector version to
dlab.ini
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1655
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 7609e52f0c1afbfe19207197453b4ab09232a78e
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Mar 26 15:51:08 2020 +0200
[DLAB-1655]: added gcs-connector version to dlab.ini
---
infrastructure-provisioning/src/general/conf/dlab.ini | 2 ++
infrastructure-provisioning/src/general/lib/gcp/actions_lib.py | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/src/general/conf/dlab.ini b/infrastructure-provisioning/src/general/conf/dlab.ini
index 8f3528e..f732871 100644
--- a/infrastructure-provisioning/src/general/conf/dlab.ini
+++ b/infrastructure-provisioning/src/general/conf/dlab.ini
@@ -286,6 +286,8 @@ matplotlib_version = 2.0.2
jupyterlab_image = odahu\/base-notebook:1.1.0-rc8
### Superset version
superset_version = 0.35.1
+### GCS-connector version
+gcs_connector_version = 2.0.1
#--- [emr] section contains all parameters that are using for emr provisioning ---#
[emr]
diff --git a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
index 1beb988..9ea0d80 100644
--- a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
@@ -1300,8 +1300,8 @@ def ensure_local_jars(os_user, jars_dir):
try:
templates_dir = '/root/templates/'
sudo('mkdir -p {}'.format(jars_dir))
- sudo('wget https://storage.googleapis.com/hadoop-lib/gcs/{0} -O {1}{0}'
- .format('gcs-connector-hadoop2-2.0.1.jar', jars_dir))
+ sudo('wget https://storage.googleapis.com/hadoop-lib/gcs/gcs-connector-hadoop2-{0}.jar -O {1}'
+ 'gcs-connector-hadoop2-{0}.jar'.format(os.environ['notebook_gcs_connector_version'], jars_dir))
sudo('wget https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-yarn-server-web-proxy/2.7.4/{0} -O {1}{0}'
.format('hadoop-yarn-server-web-proxy-2.7.4.jar', jars_dir))
put(templates_dir + 'core-site.xml', '/tmp/core-site.xml')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 04/05: [DLAB-1655]: changed gcs-connector version
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1655
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 21d60ee069049eb2419e3e8768f572a88af93738
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Mar 26 15:42:48 2020 +0200
[DLAB-1655]: changed gcs-connector version
---
infrastructure-provisioning/src/general/lib/gcp/actions_lib.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
index 5b318c8..1beb988 100644
--- a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
@@ -1301,7 +1301,7 @@ def ensure_local_jars(os_user, jars_dir):
templates_dir = '/root/templates/'
sudo('mkdir -p {}'.format(jars_dir))
sudo('wget https://storage.googleapis.com/hadoop-lib/gcs/{0} -O {1}{0}'
- .format('gcs-connector-latest-hadoop2.jar', jars_dir))
+ .format('gcs-connector-hadoop2-2.0.1.jar', jars_dir))
sudo('wget https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-yarn-server-web-proxy/2.7.4/{0} -O {1}{0}'
.format('hadoop-yarn-server-web-proxy-2.7.4.jar', jars_dir))
put(templates_dir + 'core-site.xml', '/tmp/core-site.xml')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org