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/02/28 15:13:12 UTC
[incubator-dlab] branch DLAB-1595 updated (d906020 -> ec72a18)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DLAB-1595
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
discard d906020 [DLAB-1595]: added dependency for testing
discard 33f2de7 [DLAB-1595]: removed dependencies
discard f1403ad [DLAB-1595]: added additional dependencies for testing
discard 505fcd5 [DLAB-1595]: changed nif-sg dependency
discard d8c119b [DLAB-1595]: added dependency for nif-sg association
discard 69484e5 [DLAB-1595]: added endpoint network interface to security group association
discard 7e683e7 [DLAB-1595]: added features block
discard 7b7791c [DLAB-1468]: disables shared image enabled variable in ssn_configure
discard 499404d [DLAB-1468]: disables shared image enabled variable in dlab.ini and deploy dlab script
discard 21fc597 Merge branch 'develop' of https://github.com/apache/incubator-dlab into develop
discard 6af8f81 Merge branch 'develop' of https://github.com/apache/incubator-dlab into develop
discard 195c261 Merge branch 'develop' of https://github.com/apache/incubator-dlab into develop
discard 6b8fdec DLAB-24 fixed mistake
discard cf496df Merge branch 'DLAB-24' into develop
discard c365023 jupyterlab changes
add 0ebbb5c [DLAB-1549]: Prevented lib_groups requests if library managements popup is not opened (#607)
add 52a8af1 [DLAB-1567]: Removed 'Refresh'/'Export' buttons from Billing if user is not admin (#608)
add bf0f249 [DLAB-1527]: function for apt fixed and Unattended Upgrades disabled
add afc0214 Merge pull request #609 from apache/DLAB-1527
add 44b932e [DLAB-1567]: billing issues for user who has not administrative role (#610)
add 7581c97 DLAB-1531 added endpoint tag to azure shared storage account
add 376ed8e DLAB-1531 corrected additional tags for shared bucket
add fee98e6 DLAB-1531 remade add_bucket_label function for gcp a bit and added some labels to gcp buckets after creation
add 2f3dbdf DLAB-1531 added some prints for testing
add 1e4fe85 DLAB-1531 changed add_bucket_labels function, updated code according to changed function
add 1595440 DLAB-1531 changed some variables
add 87b2781 DLAB-1531 add_bucket_labels is now called from common_create_bucket.py
add ef58d74 DLAB-1531 tag set is now passed to create_s3_bucket function
add 47a6c8f7 DLAB-1531 fixed typo
add 27f91b6 DLAB-1531 fixed errors
add bd48194 DLAB-1531 changed for testing
add 9d3e854 DLAB-1531 fixed creation in aws
add 03b6694 Merged
add 933c100 DLAB-1531 updated code
add 3b18859 DLAB-1531 changed one of gcp bucket tags
add 2c82d6a DLAB-1531 changed name bucket tags in azure and fixed typo
add 8cad8cf Merge pull request #612 from apache/DLAB-1531
add 33cdf54 [DLAB-37]: SSO supporting for RedHat implemented
add 65aab78 [DLAB-37]: SSO supporting for RedHat fixed
add 3660e72 Merge pull request #613 from apache/DLAB-37
add 3bc642d [DLAB-1573]: Billing is not available in marketpalce fixed
add 29af917 Merge pull request #614 from apache/DLAB-1573
add 89efe59 [DLAB-1567]: billing issues for user who has not administrative role (#615)
add f20f25d [DLAB-1553]: [GCP] project local backet termination fixed
add fbcfdb9 Merge pull request #616 from apache/DLAB-1553
add d03b40b DLAB-1531 returned Name tag to azure service_account
add 8db78f5 Merge pull request #617 from apache/DLAB-1531
add d02f4c0 [DLAB-1587]: Added value of service (#618)
add 4e8eae2 DLAB-1517 added usage of ssn_nginx.conf file
add 1345909 DLAB-1517 added nginx user creation
add 2239cca DLAB-1517 changed cp path for nginx.conf
add 7ce3069 Merge pull request #619 from apache/DLAB-1517
add 868e4b0 [DLAB-625] Created Jupyterlab template for Azure
add acd8932 [DLAB-625] Bugfix
add 04399b8 [DLAB-625] Fixed minor bug and updated jupyterlab version
add 0e8c625 Merge pull request #620 from apache/DLAB-625
add 5ac08a0 small style fix (#622)
add b214927 [DLAB-1570]: Rarely notebook creation fails on stage of 'npm' installation fixed
add f67b8b1 [DLAB-1570]: Rarely notebook creation fails on stage of 'npm' installation fixed
add 68b9825 Merge pull request #623 from apache/DLAB-1570
add bb069fe [DLAB-1570]: returned name of the function
add 8eb6f29 Merge pull request #624 from apache/DLAB-1570
add 31b5cc2 [DLAB-1570]: 'npm' fixes updated
add 8c2548f Merge pull request #625 from apache/DLAB-1570
add 5a644ac 'npm' install fixes
new 76a0970 [DLAB-1595]: added features block
new fd8506d [DLAB-1595]: added endpoint network interface to security group association
new dcbb778 [DLAB-1595]: added dependency for nif-sg association
new 32f4456 [DLAB-1595]: changed nif-sg dependency
new 8fb14dd [DLAB-1595]: added additional dependencies for testing
new 87cd4da3 [DLAB-1595]: removed dependencies
new ec72a18 [DLAB-1595]: added dependency for testing
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d906020)
\
N -- N -- N refs/heads/DLAB-1595 (ec72a18)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 7 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:
.../scripts/POST_DEPLOYMENT.md | 2 +
infrastructure-provisioning/scripts/deploy_dlab.py | 2 +-
.../src/general/conf/dlab.ini | 4 +-
.../{jupyter_Dockerfile => jupyterlab_Dockerfile} | 4 +-
...escription.json => jupyterlab_description.json} | 6 +-
.../general/files/gcp/jupyterlab_description.json | 2 +-
.../src/general/lib/aws/actions_lib.py | 19 +++---
.../src/general/lib/gcp/actions_lib.py | 5 +-
.../src/general/lib/os/debian/common_lib.py | 7 +-
.../src/general/lib/os/debian/ssn_lib.py | 4 ++
.../src/general/lib/os/fab.py | 27 +++++++-
.../src/general/lib/os/redhat/edge_lib.py | 65 +++++++++++++-----
.../src/general/lib/os/redhat/notebook_lib.py | 2 +-
.../src/general/lib/os/redhat/ssn_lib.py | 13 ++--
.../general/scripts/aws/common_create_bucket.py | 10 ++-
.../src/general/scripts/aws/project_prepare.py | 19 ++++--
.../src/general/scripts/aws/ssn_configure.py | 8 +--
...upyter_configure.py => jupyterlab_configure.py} | 77 ++++++++++++++--------
.../src/general/scripts/azure/project_prepare.py | 8 ++-
.../src/general/scripts/azure/ssn_configure.py | 9 +--
.../general/scripts/gcp/common_create_bucket.py | 3 +-
.../src/general/scripts/gcp/project_prepare.py | 16 ++++-
.../src/general/scripts/gcp/project_terminate.py | 7 +-
.../src/general/scripts/gcp/ssn_configure.py | 8 +--
.../jenkins_jobs/create_notebook_image/config.xml | 1 +
.../jenkins_jobs/create_notebook_server/config.xml | 1 +
.../jenkins_jobs/manage_git_credentials/config.xml | 1 +
.../jenkins_jobs/start_notebook_server/config.xml | 1 +
.../jenkins_jobs/stop_notebook_server/config.xml | 1 +
.../terminate_notebook_image/config.xml | 1 +
.../terminate_notebook_server/config.xml | 1 +
.../src/jupyterlab/Dockerfile_jupyterlab | 4 ++
.../scripts/configure_jupyterlab_node.py | 7 --
.../src/ssn/scripts/configure_ui.py | 2 +-
.../project-list/project-list.component.html | 2 +-
.../reporting-grid/reporting-grid.component.html | 8 +--
.../src/app/reporting/reporting.component.ts | 30 ++++++---
.../app/reporting/toolbar/toolbar.component.html | 1 -
.../app/reporting/toolbar/toolbar.component.scss | 1 +
.../src/app/reporting/toolbar/toolbar.component.ts | 14 +++-
.../computational-resources-list.component.scss | 19 ++++++
.../install-libraries.component.ts | 2 +
.../src/app/shared/navbar/navbar.component.ts | 4 +-
43 files changed, 289 insertions(+), 139 deletions(-)
copy infrastructure-provisioning/src/general/files/azure/{jupyter_Dockerfile => jupyterlab_Dockerfile} (96%)
copy infrastructure-provisioning/src/general/files/azure/{rstudio_description.json => jupyterlab_description.json} (84%)
copy infrastructure-provisioning/src/general/scripts/azure/{jupyter_configure.py => jupyterlab_configure.py} (90%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 06/07: [DLAB-1595]: removed dependencies
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1595
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 87cd4da3e0b4158ad66566bcecbb22e800220e09
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Feb 28 12:30:45 2020 +0200
[DLAB-1595]: removed dependencies
---
infrastructure-provisioning/terraform/azure/endpoint/main/instance.tf | 2 +-
infrastructure-provisioning/terraform/azure/endpoint/main/network.tf | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/terraform/azure/endpoint/main/instance.tf b/infrastructure-provisioning/terraform/azure/endpoint/main/instance.tf
index 75b9691..989c32c 100644
--- a/infrastructure-provisioning/terraform/azure/endpoint/main/instance.tf
+++ b/infrastructure-provisioning/terraform/azure/endpoint/main/instance.tf
@@ -35,7 +35,7 @@ resource "azurerm_virtual_machine" "endpoint_instance" {
network_interface_ids = [azurerm_network_interface.endpoint-nif.id]
vm_size = var.endpoint_shape
delete_os_disk_on_termination = true
- depends_on = [azurerm_network_interface.endpoint-nif]
+
storage_image_reference {
publisher = element(split("_", var.ami),0)
offer = element(split("_", var.ami),1)
diff --git a/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf b/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
index a6f8def..bda422b 100644
--- a/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
+++ b/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
@@ -99,5 +99,4 @@ resource "azurerm_network_interface" "endpoint-nif" {
resource "azurerm_network_interface_security_group_association" "endpoint-nif-sg" {
network_interface_id = azurerm_network_interface.endpoint-nif.id
network_security_group_id = azurerm_network_security_group.enpoint-sg.id
- depends_on = [azurerm_network_security_group.enpoint-sg, azurerm_network_interface.endpoint-nif]
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 05/07: [DLAB-1595]: added additional dependencies
for testing
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1595
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 8fb14ddd3cad6de054aa93959075bd1feaf97ad0
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Feb 28 12:01:41 2020 +0200
[DLAB-1595]: added additional dependencies for testing
---
infrastructure-provisioning/terraform/azure/endpoint/main/instance.tf | 2 +-
infrastructure-provisioning/terraform/azure/endpoint/main/network.tf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/terraform/azure/endpoint/main/instance.tf b/infrastructure-provisioning/terraform/azure/endpoint/main/instance.tf
index 989c32c..75b9691 100644
--- a/infrastructure-provisioning/terraform/azure/endpoint/main/instance.tf
+++ b/infrastructure-provisioning/terraform/azure/endpoint/main/instance.tf
@@ -35,7 +35,7 @@ resource "azurerm_virtual_machine" "endpoint_instance" {
network_interface_ids = [azurerm_network_interface.endpoint-nif.id]
vm_size = var.endpoint_shape
delete_os_disk_on_termination = true
-
+ depends_on = [azurerm_network_interface.endpoint-nif]
storage_image_reference {
publisher = element(split("_", var.ami),0)
offer = element(split("_", var.ami),1)
diff --git a/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf b/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
index 4f50bc7..a6f8def 100644
--- a/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
+++ b/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
@@ -99,5 +99,5 @@ resource "azurerm_network_interface" "endpoint-nif" {
resource "azurerm_network_interface_security_group_association" "endpoint-nif-sg" {
network_interface_id = azurerm_network_interface.endpoint-nif.id
network_security_group_id = azurerm_network_security_group.enpoint-sg.id
- depends_on = [azurerm_network_security_group.enpoint-sg]
+ depends_on = [azurerm_network_security_group.enpoint-sg, azurerm_network_interface.endpoint-nif]
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/07: [DLAB-1595]: added features block
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1595
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 76a0970844f13f954054761e3d2036056cabb600
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Feb 27 16:26:40 2020 +0200
[DLAB-1595]: added features block
---
infrastructure-provisioning/terraform/azure/endpoint/main/main.tf | 1 +
1 file changed, 1 insertion(+)
diff --git a/infrastructure-provisioning/terraform/azure/endpoint/main/main.tf b/infrastructure-provisioning/terraform/azure/endpoint/main/main.tf
index 5d832fa..b6ed11e 100644
--- a/infrastructure-provisioning/terraform/azure/endpoint/main/main.tf
+++ b/infrastructure-provisioning/terraform/azure/endpoint/main/main.tf
@@ -24,6 +24,7 @@ locals {
}
provider "azurerm" {
+ features {}
subscription_id = local.json_data.subscriptionId
client_id = local.json_data.clientId
client_secret = local.json_data.clientSecret
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 03/07: [DLAB-1595]: added dependency for nif-sg
association
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1595
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit dcbb778039eba3b709eebcefd489ceb19d271d40
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Feb 27 17:49:17 2020 +0200
[DLAB-1595]: added dependency for nif-sg association
---
infrastructure-provisioning/terraform/azure/endpoint/main/network.tf | 1 +
1 file changed, 1 insertion(+)
diff --git a/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf b/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
index bda422b..23557a0 100644
--- a/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
+++ b/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
@@ -99,4 +99,5 @@ resource "azurerm_network_interface" "endpoint-nif" {
resource "azurerm_network_interface_security_group_association" "endpoint-nif-sg" {
network_interface_id = azurerm_network_interface.endpoint-nif.id
network_security_group_id = azurerm_network_security_group.enpoint-sg.id
+ depends_on = [azurerm_network_interface.endpoint-nif, azurerm_network_security_group.enpoint-sg]
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/07: [DLAB-1595]: added endpoint network
interface to security group association
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1595
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit fd8506d5587691b36a30c635d6123c76d832cfe7
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Feb 27 16:42:59 2020 +0200
[DLAB-1595]: added endpoint network interface to security group association
---
.../terraform/azure/endpoint/main/network.tf | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf b/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
index ac782f9..bda422b 100644
--- a/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
+++ b/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
@@ -79,7 +79,6 @@ resource "azurerm_network_interface" "endpoint-nif" {
name = local.endpoint_nif_name
location = data.azurerm_resource_group.data-endpoint-resource-group.location
resource_group_name = data.azurerm_resource_group.data-endpoint-resource-group.name
- network_security_group_id = azurerm_network_security_group.enpoint-sg.id
ip_configuration {
name = "configuration"
@@ -96,3 +95,8 @@ resource "azurerm_network_interface" "endpoint-nif" {
"${var.service_base_name}-Tag" = local.endpoint_nif_name
}
}
+
+resource "azurerm_network_interface_security_group_association" "endpoint-nif-sg" {
+ network_interface_id = azurerm_network_interface.endpoint-nif.id
+ network_security_group_id = azurerm_network_security_group.enpoint-sg.id
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 07/07: [DLAB-1595]: added dependency for testing
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1595
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit ec72a18af831034bf4d877380a83300e006a85a3
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Feb 28 12:44:20 2020 +0200
[DLAB-1595]: added dependency for testing
---
infrastructure-provisioning/terraform/azure/endpoint/main/network.tf | 1 +
1 file changed, 1 insertion(+)
diff --git a/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf b/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
index bda422b..520b221 100644
--- a/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
+++ b/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
@@ -99,4 +99,5 @@ resource "azurerm_network_interface" "endpoint-nif" {
resource "azurerm_network_interface_security_group_association" "endpoint-nif-sg" {
network_interface_id = azurerm_network_interface.endpoint-nif.id
network_security_group_id = azurerm_network_security_group.enpoint-sg.id
+ depends_on = [azurerm_virtual_machine.endpoint_instance]
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 04/07: [DLAB-1595]: changed nif-sg dependency
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1595
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 32f4456daac5a84b06dcdba0963861226c9618ec
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Feb 28 11:22:41 2020 +0200
[DLAB-1595]: changed nif-sg dependency
---
infrastructure-provisioning/terraform/azure/endpoint/main/network.tf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf b/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
index 23557a0..4f50bc7 100644
--- a/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
+++ b/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
@@ -99,5 +99,5 @@ resource "azurerm_network_interface" "endpoint-nif" {
resource "azurerm_network_interface_security_group_association" "endpoint-nif-sg" {
network_interface_id = azurerm_network_interface.endpoint-nif.id
network_security_group_id = azurerm_network_security_group.enpoint-sg.id
- depends_on = [azurerm_network_interface.endpoint-nif, azurerm_network_security_group.enpoint-sg]
+ depends_on = [azurerm_network_security_group.enpoint-sg]
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org