You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2020/12/17 14:21:36 UTC
[incubator-datalab] branch DATALAB-2091 updated (2896c26 -> ed816e7)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
from 2896c26 [DATALAB-2091]: made some py3 related changes
add ac80bc9 [DATALAB-1895] Sync up DataLab instance statuses with cloud statuses
add d7fb015 [DATALAB-2159]: Removed instance which is already terminated from confirmation dialog (#985)
add 66ec0eb [DATALAB-2160]: Fixed disabled gear icon if Notebook contains Data Engine (#986)
add 325866d [DATALAB-2168]: specified qtconsole version in base dockerfile
add bef79e6 Merge pull request #987 from apache/DATALAB-2168
add 78b16de [DATALAB-2168]: specified qtconsole version in base dockerfile for azure and aws
add dd5d9ad Merge pull request #988 from apache/DATALAB-2168
add 9f0e561 [odahu-integration] Bugfixing
add 91e896f Merge pull request #696 from apache/develop
add 3882225 Merge remote-tracking branch 'origin/odahu-integration' into odahu-integration
add 8a5f6d7 Fix bug
add ac3bbf9 [DLAB-1650] Creating ODAHU cluster in same project (#926)
add bbd54b1 [DLAB-2116] Oduhu unitests (#964)
add e5fe2be [DATALAB-2162]: merged odahu_integration into develop clone, skiped changes in java files from DATALAB-1650
add bce0d47 [DATALAB-2162]: changed dlab to datalab
add 43b7e18 merge odahu (provisioning)
add 9499a58 merge odahu (provisioning)
add 05943f4 merge odahu (self-service)
add 5cea7a1 [DATALAB-2152] -- added cluster instances to scheduler status sync (#989)
add 97ce7b9 Merge remote-tracking branch 'origin/develop' into develop
add 3db6fb1 merge odahu (self-service)
add 6fbd98a [DATALAB-2162]: merged from develop
add 8351c13 Merge pull request #993 from apache/DATALAB-2162
add af885d0 [DLAB-2171]: parameters for odahu added
add 120f3d5 Merge pull request #994 from apache/DATALAB-2171
add f606f40 [DLAB-2171]: condition for odahu added
add da4d4e0 [DLAB-2171]: condition for odahu fixed
add ae57c2e Merge pull request #995 from apache/DATALAB-2171
add f3459e4 [DATALAB-2166] -- setup general roles during starting ssn (#992)
add ce468db [DATALAB-2163]: Merge odahu (UI part) to develop (#997)
add 8c8e6fd [DATALAB-2167]: Made disabled gear icon if Notebook is in failed status (#998)
add 9429a39 [DLAB-2102]: GKE cluster version updated
add d37031b [DLAB-2102]: GKE cluster version updated
add 7b67496 [DLAB-2102]: GKE cluster version updated
add 02edf20 [DLAB-2102]: Tiller version added
add 770e37c [DLAB-2102]: Tiller version added
add eac494f [DLAB-2102]: Tiller version added
add d49150c [DLAB-2102]: Tiller version added
add 68aaa46 [DLAB-2102]: Tiller version added
add 448620f [DLAB-2102]: GKE version changed
add 8a2a03f [DLAB-2102]: Tiller version added
add 5904888 [DLAB-2102]: step-ca fixed
add 92345de [DLAB-2102]: temp billing disable
add 2cd3d97 [DLAB-2102]: test
add 0381135 [DLAB-2102]: test
add f262263 [DLAB-2102]: test
add 68860b5 [DLAB-2102]: test
add 8d613e5 [DLAB-2102]: test
add e7c1c80 [DLAB-2102]: test
add 73c3a61 [DLAB-2102]: test
add 7cdbf27 [DLAB-2102]: test
add 3c58130 [DLAB-2102]: test
add ea156a6 [DLAB-2102]: test
add ab38e36 [DLAB-2102]: test
add af4e324 [DLAB-2102]: test
add 12f6809 [DLAB-2102]: test
add 47454c0 [DLAB-2102]: test
add c30ad80 [DLAB-2102]: test
add 30d82a2 [DLAB-2102]: test
add 9450f71 [DLAB-2102]: test
add 33338a0 [DLAB-2102]: test
add a4368e7 [DLAB-2102]: test
add 30130cd [DLAB-2102]: test
add b64dd53 [DLAB-2102]: test
add c9a6977 [DLAB-2102]: test
add 758104f5 [DLAB-2102]: test
add cc6be79 [DLAB-2102]: test
add f2cc703 [DLAB-2102]: test
add f30ff63 [DLAB-2102]: test
add 323afa3 [DLAB-2102]: test
add f81e9d1 [DLAB-2102]: test
add b5be833 [DLAB-2102]: test
add aec969f [DLAB-2102]: test
add 6faec02 [DLAB-2102]: test
add be7e1b2 [DLAB-2102]: test
add d466958 [DLAB-2102]: test
add 1217a1d [DLAB-2102]: test
add 3fa20e2 [DLAB-2102]: test
add 09bd5ba [DLAB-2102]: test
add baf660f [DLAB-2102]: test
add e571d2e [DLAB-2102]: test
add 819831b [DLAB-2102]: test
add af37384 [DLAB-2102]: test
add 8ff3ba9 [DLAB-2102]: test
add b03fd84 [DLAB-2102]: test
add f5106ed [DLAB-2102]: test
add 468b8a6 [DLAB-2102]: billing fixes
add a4013fb [DLAB-2102]: billing fixes
add babb36d [DLAB-2102]: billing fixes
add c1b8845 [DLAB-2102]: keycloak fixes
add 4cb94ab [DLAB-2102]: keycloak fixes
add 90f1a0b [DLAB-2102]: step-ca chart changes
add b4440eb [DLAB-2102]: step-ca chart changes
add 3bc939c [DLAB-2102]: step-ca chart changes
add e202f70 [DLAB-2102]: step-ca chart changes
add f00c5b7 [DLAB-2102]: step-ca chart changes
add 46abd10 [DLAB-2102]: step-ca chart changes
add 8d0dd2f [DLAB-2102]: step-ca chart changes
add d58ffc4 [DLAB-2102]: step-ca chart changes
add fa766a9 [DLAB-2102]: step-ca chart changes
add f3dcc34 [DLAB-2102]: step-ca chart changes
add fe4961e [DLAB-2102]: step-ca chart changes
add 4d40885 [DLAB-2102]: step-ca chart changes
add 45a64eb [DLAB-2102]: step-ca chart changes
add 56c44bb [DLAB-2102]: step-ca chart changes
add 4606a85 [DLAB-2102]: step-ca chart changes
add 0f2cd7b [DLAB-2102]: step-ca chart changes
add 65bcb97 [DLAB-2102]: step-ca chart changes
add f78f282 [DLAB-2102]: ui changes
add 5271f3e [DLAB-2102]: ui updated
add ff63aa9 [DLAB-2102]: ui updated
add 4b36759 [DLAB-2102]: ui updated
add 84057a7 [DLAB-2102]: ui updated
add bf89784 [DLAB-2102]: ui test
add bca52c9 [DLAB-2102]: ui test
add bbd69ba [DLAB-2102]: ui test
add 0b2a327 [DLAB-2102]: billing test
add 56b4cd6 [DLAB-2102]: billing test
add 38555ba [DLAB-2102]: billing test
add 9fbc6e1 [DLAB-2102]: billing test
add 73747d0 [DLAB-2102]: billing test
add f0f23c2 [DLAB-2102]: keycloak fixed
add 91f7614 [DLAB-2102]: keycloak fixed
add ac0ac20 [DLAB-2102]: keycloak test
add ed1a938 [DLAB-2102]: keycloak test
add 0c9c32e [DLAB-2102]: keycloak test
add 0cc3df1 [DLAB-2102]: keycloak test
add 60f062e [DLAB-2102]: keycloak test
add 0f5979a [DLAB-2102]: keycloak test
add f621986 [DLAB-2102]: keycloak test
add f1529bb [DLAB-2102]: keycloak test
add bab132f [DLAB-2102]: keycloak test
add 7b73563 [DLAB-2102]: keycloak test
add 2b5b52f [DLAB-2102]: keycloak test
add 02343a3 [DLAB-2102]: GKE Readme added
add dd78408 [DLAB-2102]: GKE Readme updated
add f29b319 [DLAB-2102]: mysql and mongo updated
add 3791d23 [DLAB-2102]: mongo updated
add 973dbb1 [DLAB-2102]: manual updated
add 0382fdc [DLAB-2102]: manual updated
add cf23f2c [DLAB-2102]: manual fixed
add f0ba47c [DLAB-2102]: manual fixed
add e50b5a9 [DLAB-2102]: licenses added
add 92d616f Merge pull request #999 from apache/DATALAB-2102
add ab42db9 [DATALAB-2152]: fixed sync with clusters. (#996)
add da789e6 [DATALAB-2164]: Adjusted group_tag according to the tags of the other pages (#1000)
add d28e498 [DATALAB-2141]: Fixed role values change their position during update (#1003)
add a5bb423 [DATALAB-2175] -- added roles for local endpoints (#1002)
add 3ab61a3 [DATALAB-2151]: Fixed calendar and sticky footer on Safari browser (#1004)
add 70de2ba azure-test
add 8b5902b azure-test
add 3cd3139 azure-test
add 6af48e7 azure-test
add dadf36d azure-test
add b6b44f4 [DATALAB-2173]: removed test prints
add bb55865 Merge pull request #1005 from apache/dev-azure-test
add 094d889 [DATALAB-2180] / [DATALAB-2179] -- fixed NPE, and terminated_with_err… (#1006)
add 1f7247d [DATALAB-2183]: Fixed column width on audit and management page (#1007)
add 70d56ce [DATALAB-2185]: Fixed action in gear menu and calendar on Safari (#1008)
add 4b1aa41 [DATALAB-2189]: changed some apt dependencies during ensure_r step
add 160fdcc Merge pull request #1009 from apache/DATALAB-2189
add d3c5f37 Update README.md
add c0f6ecb Update README.md
add a87a5de [DATALAB-2190]: changed how r_libs are installed in ensure_r
add ee5c9f0 [DATALAB-2190]: specified caTools version for R 3.4.4
add 083ba36 Merge pull request #1010 from apache/DATALAB-2189
add f8a89ba [DATALAB-2190]: made catools variable lowercase
add 023618b Merge pull request #1011 from apache/DATALAB-2189
add 8481b7b Update README.md
add 493e45a [DATALAB-2190]: moved caTools version to datalab.ini for jupyter
add f2464f7 Merge pull request #1014 from apache/DATALAB-2189
add 93d32c1 Update README.md
new 956f8f0 [DATALAB-2091]: made some py3 related changes
new 763ec27 [DATALAB-2091]: changed shebang in py scripts for py3
new ed816e7 [DATALAB-2091]: resolved merge conflict
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.
Summary of changes:
.../src/base/scripts/create_ssh_user.py | 2 +-
.../src/base/scripts/install_prerequisites.py | 2 +-
.../src/base/scripts/install_user_key.py | 2 +-
.../src/dataengine/scripts/configure_dataengine.py | 2 +-
.../src/edge/scripts/configure_http_proxy.py | 2 +-
.../edge/scripts/configure_nginx_reverse_proxy.py | 2 +-
.../src/general/conf/datalab.ini | 2 +
.../src/general/files/aws/base_Dockerfile | 2 +-
.../src/general/files/azure/base_Dockerfile | 2 +-
.../src/general/lib/aws/actions_lib.py | 15 +
.../src/general/lib/azure/actions_lib.py | 2 +-
.../src/general/lib/azure/meta_lib.py | 3 +-
.../src/general/lib/os/debian/notebook_lib.py | 12 +-
.../src/general/scripts/aws/odahu_deploy.py | 293 ++++++++++++
.../src/general/scripts/aws/odahu_prepare.py | 158 ++++++
.../src/general/scripts/azure/ssn_prepare.py | 3 +
.../general/scripts/gcp/common_create_bucket.py | 2 +-
.../general/scripts/gcp/common_create_firewall.py | 2 +-
.../general/scripts/gcp/common_create_instance.py | 2 +-
.../general/scripts/gcp/common_create_nat_route.py | 2 +-
.../scripts/gcp/common_create_service_account.py | 2 +-
.../general/scripts/gcp/common_create_subnet.py | 2 +-
.../src/general/scripts/gcp/edge_configure.py | 2 +-
.../general/scripts/gcp/edge_create_static_ip.py | 2 +-
.../src/general/scripts/gcp/project_prepare.py | 2 +-
.../src/general/scripts/gcp/project_terminate.py | 2 +-
.../src/jupyter/scripts/configure_jupyter_node.py | 2 +-
.../scripts/configure_jupyterlab_node.py | 2 +-
infrastructure-provisioning/src/project/fabfile.py | 2 +-
.../src/project/scripts/configure_http_proxy.py | 2 +-
.../src/project/scripts/configure_keycloak.py | 2 +-
.../src/project/scripts/configure_nftables.py | 2 +-
.../scripts/configure_nginx_reverse_proxy.py | 2 +-
.../src/rstudio/scripts/configure_rstudio_node.py | 2 +-
.../src/ssn/scripts/configure_docker.py | 38 +-
.../scripts/configure_tensor-rstudio_node.py | 2 +-
.../zeppelin/scripts/configure_zeppelin_node.py | 2 +-
.../terraform/aws/ssn-helm-charts/main/keycloak.tf | 2 +-
.../terraform/gcp/ssn-gke/README.md | 107 +++++
.../terraform/gcp/ssn-gke/main/main.tf | 1 +
.../templates/configmap-billing-conf.yaml | 24 +-
.../templates/deployment.yaml | 121 +++--
.../datalab-billing-chart/templates/service.yaml | 45 +-
.../helm_charts/datalab-billing-chart/values.yaml | 7 +-
.../{datalab-billing.tf => datalab-billing.tfb} | 3 +
.../templates/configmap-ui-conf.yaml | 31 +-
.../datalab-ui-chart/templates/deployment.yaml | 3 +-
.../datalab-ui-chart/templates/ingress.yaml | 44 +-
.../datalab-ui-chart/templates/service.yaml | 3 +-
.../helm_charts/datalab-ui-chart/values.yaml | 2 +-
.../ssn-gke/main/modules/helm_charts/datalab-ui.tf | 11 +-
.../modules/helm_charts/files/keycloak_values.yaml | 5 +-
.../modules/helm_charts/keycloak-chart/Chart.yaml} | 50 +-
.../keycloak-chart/ci/postgres-ha-values.yaml | 57 +++
.../keycloak-chart/scripts/datasource.cli} | 32 +-
.../helm_charts/keycloak-chart/scripts/ha.cli | 30 ++
.../scripts/logging.cli} | 33 +-
.../keycloak-chart/scripts/node-identifier.cli} | 31 +-
.../helm_charts/keycloak-chart/templates/NOTES.txt | 69 +++
.../keycloak-chart/templates/_helpers.tpl | 211 ++++++++
.../keycloak-chart/templates/configmap-sh.yaml} | 41 +-
.../templates/configmap-startup.yaml | 69 +++
.../templates/ingress.yaml} | 81 ++--
.../templates/poddisruptionbudget.yaml} | 43 +-
.../keycloak-chart/templates/prometheusrules.yaml} | 44 +-
.../templates/route.yaml} | 60 ++-
.../keycloak-chart/templates/secret-db.yaml} | 42 +-
.../keycloak-chart/templates/secret-keycloak.yaml} | 41 +-
.../templates/service-headless.yaml} | 58 ++-
.../templates/service-http.yaml} | 78 ++-
.../keycloak-chart/templates/serviceaccount.yaml} | 38 +-
.../keycloak-chart/templates/servicemonitor.yaml} | 50 +-
.../keycloak-chart/templates/statefulset.yaml | 201 ++++++++
.../templates/test/configmap-test.yaml | 77 +++
.../keycloak-chart/templates/test/pod-test.yaml | 62 +++
.../modules/helm_charts/keycloak-chart/values.yaml | 389 +++++++++++++++
.../ssn-gke/main/modules/helm_charts/keycloak.tf | 5 +-
.../gcp/ssn-gke/main/modules/helm_charts/main.tf | 4 +
.../gcp/ssn-gke/main/modules/helm_charts/mongo.tf | 2 +-
.../modules/helm_charts/mongodb-chart/.helmignore} | 29 +-
.../modules/helm_charts/mongodb-chart/Chart.yaml} | 47 +-
.../modules/helm_charts/mongodb-chart/README.md | 336 +++++++++++++
.../helm_charts/mongodb-chart/templates/NOTES.txt | 117 +++++
.../mongodb-chart/templates/_helpers.tpl | 273 +++++++++++
.../mongodb-chart/templates/configmap.yaml} | 44 +-
.../templates/deployment-standalone.yaml | 327 +++++++++++++
.../templates/ingress.yaml} | 77 ++-
.../templates/initialization-configmap.yaml} | 43 +-
.../templates/poddisruptionbudget-arbiter-rs.yaml} | 55 ++-
.../poddisruptionbudget-secondary-rs.yaml} | 73 ++-
.../templates/prometheus-alerting-rule.yaml} | 47 +-
.../templates/prometheus-service-monitor.yaml | 58 +++
.../mongodb-chart/templates/pvc-standalone.yaml} | 50 +-
.../mongodb-chart/templates/secrets.yaml | 55 +++
.../templates/statefulset-arbiter-rs.yaml | 210 ++++++++
.../templates/statefulset-primary-rs.yaml | 330 +++++++++++++
.../templates/statefulset-secondary-rs.yaml | 304 ++++++++++++
.../mongodb-chart/templates/svc-headless-rs.yaml} | 53 ++-
.../mongodb-chart/templates/svc-primary-rs.yaml | 67 +++
.../mongodb-chart/templates/svc-standalone.yaml | 66 +++
.../modules/helm_charts/mongodb-chart/values.yaml | 529 +++++++++++++++++++++
.../modules/helm_charts/mysql-chart/.helmignore} | 30 +-
.../modules/helm_charts/mysql-chart/Chart.yaml} | 45 +-
.../main/modules/helm_charts/mysql-chart/README.md | 255 ++++++++++
.../helm_charts/mysql-chart/templates/NOTES.txt | 69 +++
.../helm_charts/mysql-chart/templates/_helpers.tpl | 64 +++
.../templates/configurationFiles-configmap.yaml} | 42 +-
.../mysql-chart/templates/deployment.yaml | 282 +++++++++++
.../templates/initializationFiles-configmap.yaml} | 42 +-
.../values.yaml => mysql-chart/templates/pvc.yaml} | 73 ++-
.../helm_charts/mysql-chart/templates/secrets.yaml | 74 +++
.../mysql-chart/templates/serviceaccount.yaml} | 41 +-
.../mysql-chart/templates/servicemonitor.yaml} | 58 ++-
.../helm_charts/mysql-chart/templates/svc.yaml | 65 +++
.../templates/tests/test-configmap.yaml | 46 ++
.../mysql-chart/templates/tests/test.yaml | 82 ++++
.../modules/helm_charts/mysql-chart/values.yaml | 267 +++++++++++
.../gcp/ssn-gke/main/modules/helm_charts/mysql.tf | 2 +-
.../modules/helm_charts/step-ca-chart/Chart.yaml | 32 +-
.../helm_charts/step-ca-chart/templates/NOTES.txt | 20 +
.../step-ca-chart/templates/bootstrap.yaml | 33 +-
.../helm_charts/step-ca-chart/templates/ca.yaml | 262 +++++-----
.../step-ca-chart/templates/configmaps.yaml | 194 ++++----
.../step-ca-chart/templates/ingress.yaml | 41 +-
.../helm_charts/step-ca-chart/templates/rbac.yaml | 30 +-
.../step-ca-chart/templates/secrets.yaml | 30 +-
.../step-ca-chart/templates/service.yaml | 49 +-
.../templates/tests/test-connection.yaml | 6 +-
.../modules/helm_charts/step-ca-chart/values.yaml | 15 +-
.../terraform/gcp/ssn-gke/main/variables.tf | 4 +-
.../com/epam/datalab/dto/UserInstanceStatus.java | 2 +-
.../com/epam/datalab/dto/base/DataEngineType.java | 5 +-
.../epam/datalab/dto/base/odahu/OdahuResult.java} | 32 +-
.../epam/datalab/dto/odahu/ActionOdahuDTO.java} | 47 +-
.../epam/datalab/dto/odahu/CreateOdahuDTO.java} | 22 +-
.../epam/datalab/dto/status/EnvResourceList.java | 48 +-
.../java/com/epam/datalab/model/ResourceEnum.java | 3 +-
.../java/com/epam/datalab/model/ResourceType.java | 2 +-
.../datalab/dto/status/EnvResourceDTOTest.java | 6 +-
.../epam/datalab/dto/status/EnvStatusDTOTest.java | 6 +-
.../java/com/epam/datalab/cloud/CloudProvider.java | 2 +-
.../backendapi/ProvisioningServiceApplication.java | 2 +
.../core/commands/CommandExecutorMockAsync.java | 2 +-
.../response/handlers/OdahuCallbackHandler.java | 94 ++++
.../handlers/ResourcesStatusCallbackHandler.java | 42 +-
.../backendapi/modules/ProductionModule.java | 3 +
.../backendapi/modules/ProvisioningDevModule.java | 3 +
.../backendapi/resources/OdahuResource.java} | 47 +-
.../resources/base/InfrastructureService.java | 4 +-
.../datalab/backendapi/service/OdahuService.java} | 18 +-
.../backendapi/service/impl/OdahuServiceImpl.java | 115 +++++
.../datalab/backendapi/SelfServiceApplication.java | 24 +-
.../com/epam/datalab/backendapi/dao/EnvDAO.java | 7 +-
.../dao/{UserRoleDAO.java => OdahuDAO.java} | 33 +-
.../epam/datalab/backendapi/dao/OdahuDAOImpl.java | 167 +++++++
.../epam/datalab/backendapi/dao/UserRoleDAO.java | 10 +-
.../datalab/backendapi/dao/UserRoleDAOImpl.java | 26 +-
.../OdahuActionDTO.java} | 22 +-
.../OdahuCreateDTO.java} | 25 +-
.../dto/UserGroupDto.java => domain/OdahuDTO.java} | 30 +-
.../OdahuFieldsDTO.java} | 26 +-
.../epam/datalab/backendapi/domain/ProjectDTO.java | 3 +-
.../dropwizard/listeners/MongoStartupListener.java | 39 +-
.../epam/datalab/backendapi/modules/DevModule.java | 32 +-
.../backendapi/modules/ProductionModule.java | 40 +-
.../backendapi/resources/OdahuResource.java | 97 ++++
.../backendapi/resources/UserRoleResource.java | 4 +-
.../resources/callback/BackupCallback.java | 2 +-
.../callback/EnvironmentStatusCallback.java | 4 +-
.../{BackupCallback.java => OdahuCallback.java} | 54 +--
.../resources/dto/ProjectInfrastructureInfo.java | 27 +-
.../backendapi/resources/dto/UserGroupDto.java | 2 +-
.../dto/{UserRoleDto.java => UserRoleDTO.java} | 4 +-
.../CheckInfrastructureStatusScheduler.java | 215 +++++----
.../{UserRoleService.java => OdahuService.java} | 25 +-
.../backendapi/service/UserRoleService.java | 8 +-
.../backendapi/service/UserRoleServiceImpl.java | 8 +-
.../service/impl/EndpointServiceImpl.java | 21 +-
.../service/impl/EnvironmentServiceImpl.java | 104 ++--
.../impl/InfrastructureInfoServiceImpl.java | 10 +-
.../backendapi/service/impl/OdahuServiceImpl.java | 203 ++++++++
.../service/impl/ProjectServiceImpl.java | 19 +-
.../service/impl/UserGroupServiceImpl.java | 6 +-
.../datalab/backendapi/util/RequestBuilder.java | 31 ++
.../src/main/resources/mongo/aws/mongo_roles.json | 98 ----
.../main/resources/mongo/azure/mongo_roles.json | 98 ----
.../src/main/resources/mongo/gcp/mongo_roles.json | 98 ----
.../main/resources/mongo/general/mongo_roles.json | 100 ++++
.../app/administration/administration.module.ts | 5 +-
.../management-grid/management-grid.component.html | 10 +-
.../management-grid/management-grid.component.scss | 28 +-
.../management-grid/management-grid.component.ts | 57 ++-
.../create-odahu-cluster.component.html | 93 ++++
.../create-odahu-cluster.component.scss | 7 +
.../create-odahu-cluster.component.ts | 103 ++++
.../create-odahu-claster/index.ts} | 27 +-
.../webapp/src/app/administration/odahu/index.ts | 50 ++
.../app/administration/odahu/odahu-data.service.ts | 27 ++
.../odahu/odahu-grid/odahu-grid.component.html | 94 ++++
.../odahu/odahu-grid/odahu-grid.component.scss | 77 +++
.../odahu/odahu-grid/odahu-grid.component.ts | 48 ++
.../app/administration/odahu/odahu.component.html | 42 ++
.../app/administration/odahu/odahu.component.scss} | 0
.../app/administration/odahu/odahu.component.ts | 59 +++
.../project-list/project-list.component.html | 2 +-
.../project-list/project-list.component.scss | 9 +-
.../app/administration/roles/roles.component.html | 2 +-
.../app/administration/roles/roles.component.ts | 37 +-
.../resources/webapp/src/app/app.routing.module.ts | 8 +-
.../resources/webapp/src/app/core/core.module.ts | 3 +-
.../services/applicationServiceFacade.service.ts | 20 +
.../webapp/src/app/core/services/index.ts | 1 +
.../app/core/services/odahu-deployment.service.ts | 37 ++
.../webapp/src/app/core/util/errorUtils.ts | 2 +-
.../audit/audit-grid/audit-grid.component.html | 26 +-
.../audit/audit-grid/audit-grid.component.scss | 16 +
.../reporting-grid/reporting-grid.component.scss | 3 +-
.../reporting-grid/reporting-grid.component.ts | 41 ++
.../detail-dialog/detail-dialog.component.html | 35 +-
.../detail-dialog/detail-dialog.component.scss | 27 +-
.../detail-dialog/detail-dialog.component.ts | 10 +-
.../resources-grid/resources-grid.component.html | 30 +-
.../resources-grid/resources-grid.component.scss | 13 +
.../resources-grid/resources-grid.component.ts | 30 +-
.../resources-grid/resources-grid.model.ts | 86 ++++
.../confirmation-dialog.component.html | 2 +-
.../confirmation-dialog.component.ts | 14 +-
.../modal-dialog/odahu-action-dialog/index.ts | 15 +
.../odahu-action-dialog.component.ts | 50 ++
.../src/app/shared/navbar/navbar.component.html | 5 +
.../resources/webapp/src/assets/styles/_theme.scss | 7 +-
.../backendapi/resources/UserRoleResourceTest.java | 8 +-
.../backendapi/service/ProjectServiceImplTest.java | 202 ++++----
.../service/UserRoleServiceImplTest.java | 6 +-
.../service/impl/EndpointServiceImplTest.java | 93 ++--
.../service/impl/EnvironmentServiceImplTest.java | 10 +-
.../impl/InfrastructureInfoServiceImplTest.java | 11 +-
.../service/impl/OdahuServiceImplTest.java | 250 ++++++++++
238 files changed, 9943 insertions(+), 2454 deletions(-)
create mode 100644 infrastructure-provisioning/src/general/scripts/aws/odahu_deploy.py
create mode 100644 infrastructure-provisioning/src/general/scripts/aws/odahu_prepare.py
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/README.md
copy infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/{datalab-billing.tf => datalab-billing.tfb} (92%)
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak-chart/Chart.yaml} (55%)
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak-chart/ci/postgres-ha-values.yaml
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak-chart/scripts/datasource.cli} (55%)
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak-chart/scripts/ha.cli
copy infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/{datalab-billing.tf => keycloak-chart/scripts/logging.cli} (53%)
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak-chart/scripts/node-identifier.cli} (55%)
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak-chart/templates/NOTES.txt
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak-chart/templates/_helpers.tpl
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak-chart/templates/configmap-sh.yaml} (55%)
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak-chart/templates/configmap-startup.yaml
copy infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/{datalab-billing-chart/values.yaml => keycloak-chart/templates/ingress.yaml} (52%)
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak-chart/templates/poddisruptionbudget.yaml} (55%)
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak-chart/templates/prometheusrules.yaml} (55%)
copy infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/{datalab-billing.tf => keycloak-chart/templates/route.yaml} (53%)
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak-chart/templates/secret-db.yaml} (55%)
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak-chart/templates/secret-keycloak.yaml} (55%)
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak-chart/templates/service-headless.yaml} (54%)
copy infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/{datalab-billing-chart/values.yaml => keycloak-chart/templates/service-http.yaml} (50%)
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak-chart/templates/serviceaccount.yaml} (55%)
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak-chart/templates/servicemonitor.yaml} (55%)
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak-chart/templates/statefulset.yaml
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak-chart/templates/test/configmap-test.yaml
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak-chart/templates/test/pod-test.yaml
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak-chart/values.yaml
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/mongodb-chart/.helmignore} (55%)
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/mongodb-chart/Chart.yaml} (55%)
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mongodb-chart/README.md
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mongodb-chart/templates/NOTES.txt
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mongodb-chart/templates/_helpers.tpl
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/mongodb-chart/templates/configmap.yaml} (55%)
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mongodb-chart/templates/deployment-standalone.yaml
copy infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/{datalab-billing-chart/values.yaml => mongodb-chart/templates/ingress.yaml} (52%)
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/mongodb-chart/templates/initialization-configmap.yaml} (55%)
rename infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/{datalab-billing.tf => mongodb-chart/templates/poddisruptionbudget-arbiter-rs.yaml} (51%)
copy infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/{datalab-billing-chart/values.yaml => mongodb-chart/templates/poddisruptionbudget-secondary-rs.yaml} (50%)
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/mongodb-chart/templates/prometheus-alerting-rule.yaml} (55%)
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mongodb-chart/templates/prometheus-service-monitor.yaml
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/mongodb-chart/templates/pvc-standalone.yaml} (55%)
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mongodb-chart/templates/secrets.yaml
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mongodb-chart/templates/statefulset-arbiter-rs.yaml
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mongodb-chart/templates/statefulset-primary-rs.yaml
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mongodb-chart/templates/statefulset-secondary-rs.yaml
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/mongodb-chart/templates/svc-headless-rs.yaml} (55%)
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mongodb-chart/templates/svc-primary-rs.yaml
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mongodb-chart/templates/svc-standalone.yaml
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mongodb-chart/values.yaml
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/mysql-chart/.helmignore} (55%)
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/mysql-chart/Chart.yaml} (55%)
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mysql-chart/README.md
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mysql-chart/templates/NOTES.txt
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mysql-chart/templates/_helpers.tpl
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/mysql-chart/templates/configurationFiles-configmap.yaml} (55%)
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mysql-chart/templates/deployment.yaml
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/mysql-chart/templates/initializationFiles-configmap.yaml} (55%)
copy infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/{datalab-billing-chart/values.yaml => mysql-chart/templates/pvc.yaml} (52%)
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mysql-chart/templates/secrets.yaml
copy infrastructure-provisioning/{src/general/scripts/gcp/common_create_bucket.py => terraform/gcp/ssn-gke/main/modules/helm_charts/mysql-chart/templates/serviceaccount.yaml} (55%)
copy infrastructure-provisioning/{src/project/scripts/configure_nftables.py => terraform/gcp/ssn-gke/main/modules/helm_charts/mysql-chart/templates/servicemonitor.yaml} (55%)
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mysql-chart/templates/svc.yaml
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mysql-chart/templates/tests/test-configmap.yaml
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mysql-chart/templates/tests/test.yaml
create mode 100644 infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mysql-chart/values.yaml
copy services/{self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/UserGroupDto.java => datalab-model/src/main/java/com/epam/datalab/dto/base/odahu/OdahuResult.java} (53%)
copy services/{self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ProjectInfrastructureInfo.java => datalab-model/src/main/java/com/epam/datalab/dto/odahu/ActionOdahuDTO.java} (52%)
copy services/{datalab-webapp-common/src/main/java/com/epam/datalab/cloud/CloudProvider.java => datalab-model/src/main/java/com/epam/datalab/dto/odahu/CreateOdahuDTO.java} (60%)
create mode 100644 services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/OdahuCallbackHandler.java
copy services/{self-service/src/main/java/com/epam/datalab/backendapi/resources/UserRoleResource.java => provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/OdahuResource.java} (54%)
copy services/{self-service/src/main/java/com/epam/datalab/backendapi/service/UserRoleService.java => provisioning-service/src/main/java/com/epam/datalab/backendapi/service/OdahuService.java} (67%)
create mode 100644 services/provisioning-service/src/main/java/com/epam/datalab/backendapi/service/impl/OdahuServiceImpl.java
copy services/self-service/src/main/java/com/epam/datalab/backendapi/dao/{UserRoleDAO.java => OdahuDAO.java} (52%)
create mode 100644 services/self-service/src/main/java/com/epam/datalab/backendapi/dao/OdahuDAOImpl.java
copy services/self-service/src/main/java/com/epam/datalab/backendapi/{resources/dto/UserGroupDto.java => domain/OdahuActionDTO.java} (74%)
copy services/self-service/src/main/java/com/epam/datalab/backendapi/{resources/dto/UserGroupDto.java => domain/OdahuCreateDTO.java} (70%)
copy services/self-service/src/main/java/com/epam/datalab/backendapi/{resources/dto/UserGroupDto.java => domain/OdahuDTO.java} (58%)
copy services/self-service/src/main/java/com/epam/datalab/backendapi/{resources/dto/UserGroupDto.java => domain/OdahuFieldsDTO.java} (66%)
create mode 100644 services/self-service/src/main/java/com/epam/datalab/backendapi/resources/OdahuResource.java
copy services/self-service/src/main/java/com/epam/datalab/backendapi/resources/callback/{BackupCallback.java => OdahuCallback.java} (55%)
rename services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/{UserRoleDto.java => UserRoleDTO.java} (97%)
copy services/self-service/src/main/java/com/epam/datalab/backendapi/service/{UserRoleService.java => OdahuService.java} (51%)
create mode 100644 services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/OdahuServiceImpl.java
create mode 100644 services/self-service/src/main/resources/mongo/general/mongo_roles.json
create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/odahu/create-odahu-claster/create-odahu-cluster.component.html
create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/odahu/create-odahu-claster/create-odahu-cluster.component.scss
create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/odahu/create-odahu-claster/create-odahu-cluster.component.ts
copy services/self-service/src/main/resources/webapp/src/app/administration/{administration.module.ts => odahu/create-odahu-claster/index.ts} (54%)
create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/odahu/index.ts
create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/odahu/odahu-data.service.ts
create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/odahu/odahu-grid/odahu-grid.component.html
create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/odahu/odahu-grid/odahu-grid.component.scss
create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/odahu/odahu-grid/odahu-grid.component.ts
create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/odahu/odahu.component.html
rename services/self-service/src/{test/java/com/epam/datalab/backendapi/.gitkeep => main/resources/webapp/src/app/administration/odahu/odahu.component.scss} (100%)
create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/odahu/odahu.component.ts
create mode 100644 services/self-service/src/main/resources/webapp/src/app/core/services/odahu-deployment.service.ts
create mode 100644 services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/odahu-action-dialog/index.ts
create mode 100644 services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/odahu-action-dialog/odahu-action-dialog.component.ts
create mode 100644 services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/OdahuServiceImplTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/03: [DATALAB-2091]: made some py3 related
changes
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 956f8f05e4738b836d41780bf09f8a23baacd471
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Nov 20 15:20:27 2020 +0200
[DATALAB-2091]: made some py3 related changes
---
infrastructure-provisioning/scripts/deploy_datalab.py | 2 +-
infrastructure-provisioning/src/base/entrypoint.py | 2 +-
.../src/general/files/gcp/base_Dockerfile | 9 ++++-----
.../src/general/lib/os/debian/common_lib.py | 2 +-
infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py | 2 +-
infrastructure-provisioning/src/ssn/fabfile.py | 2 +-
6 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/infrastructure-provisioning/scripts/deploy_datalab.py b/infrastructure-provisioning/scripts/deploy_datalab.py
index 530f19b..2e8b7e0 100644
--- a/infrastructure-provisioning/scripts/deploy_datalab.py
+++ b/infrastructure-provisioning/scripts/deploy_datalab.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/infrastructure-provisioning/src/base/entrypoint.py b/infrastructure-provisioning/src/base/entrypoint.py
index 4780acf..c8b5eb4 100644
--- a/infrastructure-provisioning/src/base/entrypoint.py
+++ b/infrastructure-provisioning/src/base/entrypoint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/general/files/gcp/base_Dockerfile b/infrastructure-provisioning/src/general/files/gcp/base_Dockerfile
index 0590753..ba5274a 100644
--- a/infrastructure-provisioning/src/general/files/gcp/base_Dockerfile
+++ b/infrastructure-provisioning/src/general/files/gcp/base_Dockerfile
@@ -26,12 +26,11 @@ ARG SRC_PATH
# Install any .deb dependecies
RUN apt-get update && \
apt-get -y upgrade && \
- apt-get -y install python-pip python-dev groff vim less git wget nano libssl-dev libffi-dev libffi6 && \
+ apt-get -y install python3-pip python-dev groff vim less git wget nano libssl-dev libffi-dev libffi6 && \
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-# Install any python dependencies
-RUN pip install -UI qtconsole==4.7.7 pip==20.1 && \
- pip install boto3 backoff fabric==1.14.0 fabvenv argparse ujson jupyter pycrypto google-api-python-client google-cloud-storage \
+RUN pip3 install -UI pip==20.1 && \
+ pip3 install boto3 backoff fab-classic fabvenv argparse ujson jupyter pycrypto google-api-python-client google-cloud-storage \
pyyaml google-auth-httplib2 oauth2client
# Configuring ssh for user
@@ -58,7 +57,7 @@ RUN mkdir -p /root/conf && \
mkdir -p /root/scripts && \
mkdir -p /root/templates && \
mkdir -p /root/files && \
- mkdir -p /usr/lib/python2.7/datalab && \
+ mkdir -p /usr/lib/python3.6/datalab && \
mkdir -p /root/keys/.ssh
COPY ${SRC_PATH}base/ /root
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
index a5f3984..8f8c5ae 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
index ee53977..5968aa2 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/ssn/fabfile.py b/infrastructure-provisioning/src/ssn/fabfile.py
index a004520..47da688 100644
--- a/infrastructure-provisioning/src/ssn/fabfile.py
+++ b/infrastructure-provisioning/src/ssn/fabfile.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 03/03: [DATALAB-2091]: resolved merge conflict
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit ed816e70b9890c78757f41a2868c7ef261c6a476
Merge: 763ec27 2896c26
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Dec 17 16:21:09 2020 +0200
[DATALAB-2091]: resolved merge conflict
infrastructure-provisioning/src/general/files/gcp/base_Dockerfile | 1 +
1 file changed, 1 insertion(+)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 02/03: [DATALAB-2091]: changed shebang in py
scripts for py3
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 763ec27be51927d044538a1de169527c49e5959d
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Dec 17 16:19:03 2020 +0200
[DATALAB-2091]: changed shebang in py scripts for py3
---
infrastructure-provisioning/src/base/scripts/create_ssh_user.py | 2 +-
infrastructure-provisioning/src/base/scripts/install_prerequisites.py | 2 +-
infrastructure-provisioning/src/base/scripts/install_user_key.py | 2 +-
infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py | 2 +-
.../src/edge/scripts/configure_nginx_reverse_proxy.py | 2 +-
.../src/general/scripts/gcp/common_create_bucket.py | 2 +-
.../src/general/scripts/gcp/common_create_firewall.py | 2 +-
.../src/general/scripts/gcp/common_create_instance.py | 2 +-
.../src/general/scripts/gcp/common_create_nat_route.py | 2 +-
.../src/general/scripts/gcp/common_create_service_account.py | 2 +-
.../src/general/scripts/gcp/common_create_subnet.py | 2 +-
infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py | 2 +-
.../src/general/scripts/gcp/edge_create_static_ip.py | 2 +-
infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py | 2 +-
.../src/general/scripts/gcp/project_terminate.py | 2 +-
infrastructure-provisioning/src/project/fabfile.py | 2 +-
infrastructure-provisioning/src/project/scripts/configure_http_proxy.py | 2 +-
infrastructure-provisioning/src/project/scripts/configure_keycloak.py | 2 +-
infrastructure-provisioning/src/project/scripts/configure_nftables.py | 2 +-
.../src/project/scripts/configure_nginx_reverse_proxy.py | 2 +-
20 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/infrastructure-provisioning/src/base/scripts/create_ssh_user.py b/infrastructure-provisioning/src/base/scripts/create_ssh_user.py
index 482eb2c..fb9dfbb 100644
--- a/infrastructure-provisioning/src/base/scripts/create_ssh_user.py
+++ b/infrastructure-provisioning/src/base/scripts/create_ssh_user.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/base/scripts/install_prerequisites.py b/infrastructure-provisioning/src/base/scripts/install_prerequisites.py
index 5c95894..e1ba273 100644
--- a/infrastructure-provisioning/src/base/scripts/install_prerequisites.py
+++ b/infrastructure-provisioning/src/base/scripts/install_prerequisites.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/base/scripts/install_user_key.py b/infrastructure-provisioning/src/base/scripts/install_user_key.py
index 74e22de..baace81 100644
--- a/infrastructure-provisioning/src/base/scripts/install_user_key.py
+++ b/infrastructure-provisioning/src/base/scripts/install_user_key.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py b/infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py
index 0adb505..3d49a2d 100644
--- a/infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py
+++ b/infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py b/infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py
index 8b67a41..cefaffe 100644
--- a/infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py
+++ b/infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_create_bucket.py b/infrastructure-provisioning/src/general/scripts/gcp/common_create_bucket.py
index 3dfeda9..061746a 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/common_create_bucket.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/common_create_bucket.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_create_firewall.py b/infrastructure-provisioning/src/general/scripts/gcp/common_create_firewall.py
index 7874352..aa126c5 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/common_create_firewall.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/common_create_firewall.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_create_instance.py b/infrastructure-provisioning/src/general/scripts/gcp/common_create_instance.py
index 3b85760..decdaf9 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/common_create_instance.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/common_create_instance.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_create_nat_route.py b/infrastructure-provisioning/src/general/scripts/gcp/common_create_nat_route.py
index 435eafb..d9a5f0b 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/common_create_nat_route.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/common_create_nat_route.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py b/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py
index 8d46793..d1e9a55 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_create_subnet.py b/infrastructure-provisioning/src/general/scripts/gcp/common_create_subnet.py
index b35d277..280eab7 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/common_create_subnet.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/common_create_subnet.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
index 3a1ca91..6532870 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/edge_create_static_ip.py b/infrastructure-provisioning/src/general/scripts/gcp/edge_create_static_ip.py
index dfd1b40..0411f7e 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_create_static_ip.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_create_static_ip.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
index 47a781d..683cb1f 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py b/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py
index 4b8581b..7e0dbfc 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/project/fabfile.py b/infrastructure-provisioning/src/project/fabfile.py
index d60bfb8..c2d108f 100644
--- a/infrastructure-provisioning/src/project/fabfile.py
+++ b/infrastructure-provisioning/src/project/fabfile.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/project/scripts/configure_http_proxy.py b/infrastructure-provisioning/src/project/scripts/configure_http_proxy.py
index 0adb505..3d49a2d 100644
--- a/infrastructure-provisioning/src/project/scripts/configure_http_proxy.py
+++ b/infrastructure-provisioning/src/project/scripts/configure_http_proxy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/project/scripts/configure_keycloak.py b/infrastructure-provisioning/src/project/scripts/configure_keycloak.py
index 1120759..11850c7 100644
--- a/infrastructure-provisioning/src/project/scripts/configure_keycloak.py
+++ b/infrastructure-provisioning/src/project/scripts/configure_keycloak.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/project/scripts/configure_nftables.py b/infrastructure-provisioning/src/project/scripts/configure_nftables.py
index c630cab..872d3bd 100644
--- a/infrastructure-provisioning/src/project/scripts/configure_nftables.py
+++ b/infrastructure-provisioning/src/project/scripts/configure_nftables.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py b/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py
index edb86fd..322c642 100644
--- a/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py
+++ b/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org