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:07:07 UTC
[incubator-dlab] branch DLAB-1468 updated (170d313 -> 5b55d74)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DLAB-1468
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
discard 170d313 [DLAB-1468]: removed shared_image_enabled from README.md
discard d09566a [DLAB-1468]: removed usage of shared_image_enabled during ssn creation
omit 7b7791c [DLAB-1468]: disables shared image enabled variable in ssn_configure
omit 499404d [DLAB-1468]: disables shared image enabled variable in dlab.ini and deploy dlab script
omit 21fc597 Merge branch 'develop' of https://github.com/apache/incubator-dlab into develop
omit 6af8f81 Merge branch 'develop' of https://github.com/apache/incubator-dlab into develop
omit 195c261 Merge branch 'develop' of https://github.com/apache/incubator-dlab into develop
omit 6b8fdec DLAB-24 fixed mistake
omit cf496df Merge branch 'DLAB-24' into develop
omit 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 c031f1a [DLAB-1468]: disables shared image enabled variable in dlab.ini and deploy dlab script
new 1e5e8cc [DLAB-1468]: disables shared image enabled variable in ssn_configure
new 88572a5 [DLAB-1468]: removed usage of shared_image_enabled during ssn creation
new 5b55d74 [DLAB-1468]: removed shared_image_enabled from README.md
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 (170d313)
\
N -- N -- N refs/heads/DLAB-1468 (5b55d74)
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 4 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 +
.../src/general/conf/dlab.ini | 2 +-
.../{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 ++++--
...upyter_configure.py => jupyterlab_configure.py} | 77 ++++++++++++++--------
.../src/general/scripts/azure/project_prepare.py | 8 ++-
.../src/general/scripts/azure/ssn_configure.py | 1 +
.../general/scripts/gcp/common_create_bucket.py | 3 +-
.../src/general/scripts/gcp/project_prepare.py | 16 ++++-
.../src/general/scripts/gcp/project_terminate.py | 7 +-
.../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 +-
40 files changed, 275 insertions(+), 125 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] 02/04: [DLAB-1468]: disables shared image enabled
variable in ssn_configure
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1468
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 1e5e8cc9c7f75d411a41445b7002ed6d7abeef6d
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Feb 27 15:35:06 2020 +0200
[DLAB-1468]: disables shared image enabled variable in ssn_configure
---
.../src/general/scripts/aws/ssn_configure.py | 8 ++++----
.../src/general/scripts/azure/ssn_configure.py | 8 ++++----
.../src/general/scripts/gcp/ssn_configure.py | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index a4d6dbc..850d49b 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -465,10 +465,10 @@ if __name__ == "__main__":
'key': 'AZURE_CLIENT_ID',
'value': ''
},
- {
- 'key': 'SHARED_IMAGE_ENABLED',
- 'value': os.environ['conf_shared_image_enabled']
- },
+ # {
+ # 'key': 'SHARED_IMAGE_ENABLED',
+ # 'value': os.environ['conf_shared_image_enabled']
+ # },
{
'key': 'CONF_IMAGE_ENABLED',
'value': os.environ['conf_image_enabled']
diff --git a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
index 4f35a62..2eddb3f 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
@@ -312,10 +312,10 @@ if __name__ == "__main__":
'key': 'PEERING_ID',
'value': ''
},
- {
- 'key': 'SHARED_IMAGE_ENABLED',
- 'value': os.environ['conf_shared_image_enabled']
- },
+# {
+# 'key': 'SHARED_IMAGE_ENABLED',
+# 'value': os.environ['conf_shared_image_enabled']
+# },
{
'key': 'CONF_IMAGE_ENABLED',
'value': os.environ['conf_image_enabled']
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index 87cd29a..c8b4cae 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -406,10 +406,10 @@ if __name__ == "__main__":
'key': 'PEERING_ID',
'value': ''
},
- {
- 'key': 'SHARED_IMAGE_ENABLED',
- 'value': os.environ['conf_shared_image_enabled']
- },
+ # {
+ # 'key': 'SHARED_IMAGE_ENABLED',
+ # 'value': os.environ['conf_shared_image_enabled']
+ # },
{
'key': 'CONF_IMAGE_ENABLED',
'value': os.environ['conf_image_enabled']
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 03/04: [DLAB-1468]: removed usage of
shared_image_enabled during ssn creation
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1468
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 88572a516242dc3f5ca05985ef36093f1776e14e
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Feb 28 12:48:04 2020 +0200
[DLAB-1468]: removed usage of shared_image_enabled during ssn creation
---
infrastructure-provisioning/scripts/deploy_dlab.py | 1 -
infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py | 4 ----
.../src/general/scripts/azure/ssn_configure.py | 4 ----
infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py | 4 ----
4 files changed, 13 deletions(-)
diff --git a/infrastructure-provisioning/scripts/deploy_dlab.py b/infrastructure-provisioning/scripts/deploy_dlab.py
index 1b820cf..40b1485 100644
--- a/infrastructure-provisioning/scripts/deploy_dlab.py
+++ b/infrastructure-provisioning/scripts/deploy_dlab.py
@@ -40,7 +40,6 @@ parser.add_argument('--conf_private_subnet_prefix', type=str, default='24', help
parser.add_argument('--conf_additional_tags', type=str, default='', help='Additional tags in format '
'"Key1:Value1;Key2:Value2"')
parser.add_argument('--conf_image_enabled', type=str, default='', help='Enable or Disable creating image at first time')
-#parser.add_argument('--conf_shared_image_enabled', type=str, default='', help='Enable or Disable shared images')
parser.add_argument('--aws_user_predefined_s3_policies', type=str, default='', help='Predefined policies for users '
'instances')
parser.add_argument('--aws_access_key', type=str, default='', help='AWS Access Key ID')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index 850d49b..9259032 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -465,10 +465,6 @@ if __name__ == "__main__":
'key': 'AZURE_CLIENT_ID',
'value': ''
},
- # {
- # 'key': 'SHARED_IMAGE_ENABLED',
- # 'value': os.environ['conf_shared_image_enabled']
- # },
{
'key': 'CONF_IMAGE_ENABLED',
'value': os.environ['conf_image_enabled']
diff --git a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
index 2eddb3f..e1be85c 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
@@ -312,10 +312,6 @@ if __name__ == "__main__":
'key': 'PEERING_ID',
'value': ''
},
-# {
-# 'key': 'SHARED_IMAGE_ENABLED',
-# 'value': os.environ['conf_shared_image_enabled']
-# },
{
'key': 'CONF_IMAGE_ENABLED',
'value': os.environ['conf_image_enabled']
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index c8b4cae..cbc1673 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -406,10 +406,6 @@ if __name__ == "__main__":
'key': 'PEERING_ID',
'value': ''
},
- # {
- # 'key': 'SHARED_IMAGE_ENABLED',
- # 'value': os.environ['conf_shared_image_enabled']
- # },
{
'key': 'CONF_IMAGE_ENABLED',
'value': os.environ['conf_image_enabled']
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/04: [DLAB-1468]: disables shared image enabled
variable in dlab.ini and deploy dlab script
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1468
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit c031f1a246993a1b5f9bc224b904e39078dcafb7
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Feb 27 14:49:04 2020 +0200
[DLAB-1468]: disables shared image enabled variable in dlab.ini and deploy dlab script
---
infrastructure-provisioning/scripts/deploy_dlab.py | 2 +-
infrastructure-provisioning/src/general/conf/dlab.ini | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/scripts/deploy_dlab.py b/infrastructure-provisioning/scripts/deploy_dlab.py
index 33a5f6d..1b820cf 100644
--- a/infrastructure-provisioning/scripts/deploy_dlab.py
+++ b/infrastructure-provisioning/scripts/deploy_dlab.py
@@ -40,7 +40,7 @@ parser.add_argument('--conf_private_subnet_prefix', type=str, default='24', help
parser.add_argument('--conf_additional_tags', type=str, default='', help='Additional tags in format '
'"Key1:Value1;Key2:Value2"')
parser.add_argument('--conf_image_enabled', type=str, default='', help='Enable or Disable creating image at first time')
-parser.add_argument('--conf_shared_image_enabled', type=str, default='', help='Enable or Disable shared images')
+#parser.add_argument('--conf_shared_image_enabled', type=str, default='', help='Enable or Disable shared images')
parser.add_argument('--aws_user_predefined_s3_policies', type=str, default='', help='Predefined policies for users '
'instances')
parser.add_argument('--aws_access_key', type=str, default='', help='AWS Access Key ID')
diff --git a/infrastructure-provisioning/src/general/conf/dlab.ini b/infrastructure-provisioning/src/general/conf/dlab.ini
index 8e4cfa5..8f3528e 100644
--- a/infrastructure-provisioning/src/general/conf/dlab.ini
+++ b/infrastructure-provisioning/src/general/conf/dlab.ini
@@ -47,7 +47,7 @@ gitlab_certfile = dlab-gitlab.crt
### Enable or Disable creating image at first time
image_enabled = true
###Enable or Disable shared images
-shared_image_enabled = true
+#shared_image_enabled = true
### CIDR of VPC
vpc_cidr = '172.31.0.0/16'
### CIDR of second VPC
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 04/04: [DLAB-1468]: removed shared_image_enabled
from README.md
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1468
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 5b55d7408011612d8f3a2bf13424b75c6e850290
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Feb 28 15:03:44 2020 +0200
[DLAB-1468]: removed shared_image_enabled from README.md
---
README.md | 3 ---
1 file changed, 3 deletions(-)
diff --git a/README.md b/README.md
index eff3738..6722e59 100644
--- a/README.md
+++ b/README.md
@@ -478,7 +478,6 @@ List of parameters for SSN node deployment:
| action | In case of SSN node creation, this parameter should be set to “create”|
| workspace\_path | Path to DLab sources root
| conf\_image\_enabled | Enable or Disable creating image at first time |
-| conf\_shared\_image\_enabled | Enable or Disable shared images |
**Note:** If the following parameters are not specified, they will be created automatically:
- aws\_vpc\_id
@@ -533,7 +532,6 @@ List of parameters for SSN node deployment:
| azure\_ad\_group\_id | ID of group in Active directory whose members have full access to shared folder in Azure Data Lake Store |
| action | In case of SSN node creation, this parameter should be set to “create” |
| conf\_image\_enabled | Enable or Disable creating image at first time |
-| conf\_shared\_image\_enabled | Enable or Disable shared images |
**Note:** If the following parameters are not specified, they will be created automatically:
@@ -601,7 +599,6 @@ List of parameters for SSN node deployment:
| gcp\_project\_id | ID of GCP project |
| action | In case of SSN node creation, this parameter should be set to “create” |
| conf\_image\_enabled | Enable or Disable creating image at first time |
-| conf\_shared\_image\_enabled | Enable or Disable shared images |
| billing\_dataset\_name | Name of GCP dataset (BigQuery service) |
**Note:** If you gonna use Dataproc cluster, be aware that Dataproc has limited availability in GCP regions. [Cloud Dataproc availability by Region in GCP](https://cloud.google.com/about/locations/)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org