tree 3a8ab81048969e9b3c33168943f46498ec10c228
parent af995e98b3b3cf526fb9741a3e5117dd1e04f3aa
parent 3b6761159d39388a4221ef4001f78e8b8a06de3e
author Oleh Fuks <olegfuks98@gmail.com> 1588937317 +0300
committer Oleh Fuks <olegfuks98@gmail.com> 1588937317 +0300

Merge remote-tracking branch 'remotes/origin/v2.3.0'

# Conflicts:
#	README.md
#	RELEASE_NOTES.md
#	build.properties
#	infrastructure-provisioning/src/general/files/aws/deeplearning_description.json
#	infrastructure-provisioning/src/general/files/azure/deeplearning_description.json
#	infrastructure-provisioning/src/general/files/gcp/deeplearning_description.json
#	infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
#	infrastructure-provisioning/src/general/scripts/azure/common_prepare_notebook.py
#	infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
#	infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
#	infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py
#	infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
#	infrastructure-provisioning/src/general/scripts/gcp/ssn_terminate.py
#	infrastructure-provisioning/src/general/scripts/gcp/ssn_terminate_gcp_resources.py
#	infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py
#	infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py
#	infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py
#	infrastructure-provisioning/terraform/aws/computational_resources/main/main.tf
#	infrastructure-provisioning/terraform/aws/computational_resources/main/variables.tf
#	infrastructure-provisioning/terraform/aws/computational_resources/modules/ami/ami.tf
#	infrastructure-provisioning/terraform/aws/computational_resources/modules/common/iam.tf
#	infrastructure-provisioning/terraform/aws/computational_resources/modules/common/network.tf
#	infrastructure-provisioning/terraform/aws/computational_resources/modules/data_engine/instance.tf
#	infrastructure-provisioning/terraform/aws/computational_resources/modules/emr/instance.tf
#	infrastructure-provisioning/terraform/aws/computational_resources/modules/notebook/instance.tf
#	infrastructure-provisioning/terraform/aws/endpoint/main/iam.tf
#	infrastructure-provisioning/terraform/aws/endpoint/main/instance.tf
#	infrastructure-provisioning/terraform/aws/endpoint/main/network.tf
#	infrastructure-provisioning/terraform/aws/endpoint/main/variables.tf
#	infrastructure-provisioning/terraform/aws/project/main/iam.tf
#	infrastructure-provisioning/terraform/aws/project/main/instance.tf
#	infrastructure-provisioning/terraform/aws/project/main/network.tf
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing.tf
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ui-conf.yaml
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/deployment.yaml
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/service.yaml
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/values.yaml
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui.tf
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/files/configure_keycloak.sh
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/files/keycloak_values.yaml
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/files/mongo_values.yaml
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/files/mysql_keycloak_values.yaml
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/files/nginx_values.yaml
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/keycloak.tf
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/main.tf
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/mongo.tf
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/mysql.tf
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/nginx.tf
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/secrets.tf
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/variables.tf
#	infrastructure-provisioning/terraform/aws/ssn-k8s/main/auto_scaling_groups.tf
#	infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/masters-user-data.sh
#	infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/ssn-policy.json.tpl
#	infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/workers-user-data.sh
#	infrastructure-provisioning/terraform/aws/ssn-k8s/main/lb.tf
#	infrastructure-provisioning/terraform/aws/ssn-k8s/main/main.tf
#	infrastructure-provisioning/terraform/aws/ssn-k8s/main/role_policy.tf
#	infrastructure-provisioning/terraform/aws/ssn-k8s/main/s3.tf
#	infrastructure-provisioning/terraform/aws/ssn-k8s/main/security_groups.tf
#	infrastructure-provisioning/terraform/aws/ssn-k8s/main/variables.tf
#	infrastructure-provisioning/terraform/aws/ssn-k8s/main/vpc.tf
#	infrastructure-provisioning/terraform/azure/computational_resources/modules/data_engine/instance.tf
#	infrastructure-provisioning/terraform/azure/computational_resources/modules/notebook/instance.tf
#	infrastructure-provisioning/terraform/azure/project/main/instance.tf
#	infrastructure-provisioning/terraform/bin/deploy/__init__.py
#	infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
#	infrastructure-provisioning/terraform/bin/deploy/provisioning.yml
#	infrastructure-provisioning/terraform/bin/deploy/supervisor_svc.conf
#	infrastructure-provisioning/terraform/bin/dlab.py
#	infrastructure-provisioning/terraform/bin/terraform-cli.py
#	infrastructure-provisioning/terraform/gcp/endpoint/main/iam.tf
#	infrastructure-provisioning/terraform/gcp/endpoint/main/instance.tf
#	infrastructure-provisioning/terraform/gcp/endpoint/main/main.tf
#	infrastructure-provisioning/terraform/gcp/endpoint/main/network.tf
#	infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf
#	infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py
#	infrastructure-provisioning/terraform/gcp/endpoint/provisioning.yml
#	infrastructure-provisioning/terraform/gcp/main/main.tf
#	infrastructure-provisioning/terraform/gcp/main/variables.tf
#	infrastructure-provisioning/terraform/gcp/modules/common/iam.tf
#	infrastructure-provisioning/terraform/gcp/modules/common/network.tf
#	infrastructure-provisioning/terraform/gcp/modules/common/variables.tf
#	infrastructure-provisioning/terraform/gcp/modules/data_engine/instance.tf
#	infrastructure-provisioning/terraform/gcp/modules/data_engine/variables.tf
#	infrastructure-provisioning/terraform/gcp/modules/dataproc/instance.tf
#	infrastructure-provisioning/terraform/gcp/modules/dataproc/variables.tf
#	infrastructure-provisioning/terraform/gcp/modules/notebook/instance.tf
#	infrastructure-provisioning/terraform/gcp/modules/notebook/variables.tf
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/buckets.tf
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/gke.tf
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/iam.tf
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/vpc.tf
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing.tf
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/configmap-ui-conf.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/deployment.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/ingress.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/configure_keycloak.sh
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/keycloak_values.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/mongo_values.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/mysql_values.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/nginx_values.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/main.tf
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mongo.tf
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mysql.tf
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/nginx.tf
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/outputs.tf
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/secrets.tf
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/variables.tf
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/outputs.tf
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/variables.tf
#	infrastructure-provisioning/terraform/keycloak-theme/dlab/login/resources/css/login.css
#	infrastructure-provisioning/terraform/keycloak-theme/dlab/login/resources/img/favicon.ico
#	infrastructure-provisioning/terraform/keycloak-theme/dlab/login/resources/img/feedback-error-arrow-down.png
#	infrastructure-provisioning/terraform/keycloak-theme/dlab/login/resources/img/feedback-error-sign.png
#	infrastructure-provisioning/terraform/keycloak-theme/dlab/login/resources/img/feedback-success-arrow-down.png
#	infrastructure-provisioning/terraform/keycloak-theme/dlab/login/resources/img/feedback-success-sign.png
#	infrastructure-provisioning/terraform/keycloak-theme/dlab/login/resources/img/feedback-warning-arrow-down.png
#	infrastructure-provisioning/terraform/keycloak-theme/dlab/login/resources/img/feedback-warning-sign.png
#	infrastructure-provisioning/terraform/keycloak-theme/dlab/login/resources/img/keycloak-logo.png
#	infrastructure-provisioning/terraform/keycloak-theme/dlab/login/resources/img/login-icons.png
#	infrastructure-provisioning/terraform/keycloak-theme/dlab/login/resources/img/logo.png
#	infrastructure-provisioning/terraform/keycloak-theme/dlab/login/theme.properties
#	integration-tests-cucumber/pom.xml
#	integration-tests-cucumber/src/main/java/org/apache/dlab/dto/EndpointDTO.java
#	integration-tests-cucumber/src/main/java/org/apache/dlab/mongo/MongoDBHelper.java
#	integration-tests-cucumber/src/main/java/org/apache/dlab/util/JacksonMapper.java
#	integration-tests-cucumber/src/main/java/org/apache/dlab/util/PropertyHelper.java
#	integration-tests-cucumber/src/test/java/dlab/Constants.java
#	integration-tests-cucumber/src/test/java/dlab/RunCucumberTest.java
#	integration-tests-cucumber/src/test/java/dlab/endpoint/EndpointSteps.java
#	integration-tests-cucumber/src/test/java/dlab/login/LoginSteps.java
#	integration-tests-cucumber/src/test/resources/config.properties
#	integration-tests-cucumber/src/test/resources/dlab/endpoint.feature
#	integration-tests-cucumber/src/test/resources/dlab/login.feature
#	integration-tests/examples/scenario_deeplearning/deeplearning_tests.py
#	integration-tests/examples/test_templates/deeplearning/conv.prototxt
#	integration-tests/pom.xml
#	integration-tests/src/test/java/com/epam/dlab/automation/test/TestServices.java
#	services/billing-azure/src/main/java/com/epam/dlab/billing/azure/AzureBillableResourcesService.java
#	services/billing-azure/src/main/java/com/epam/dlab/billing/azure/model/AzureDailyResourceInvoice.java
#	services/billing-gcp/billing.yml
#	services/billing-gcp/src/main/resources/application.yml
#	services/billing-gcp/src/test/java/com/epam/dlab/billing/gcp/service/BillingServiceImplTest.java
#	services/self-service/entrypoint_aws.sh
#	services/self-service/entrypoint_gcp.sh
#	services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ImageExploratoryDao.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ImageExploratoryDaoImpl.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/dao/aws/AwsBillingDAO.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/domain/BaseShape.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/domain/DataEngineServiceShape.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/domain/DataEngineShape.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointShape.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ExploratoryShape.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectManagingDTO.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/domain/SsnShape.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/service/ImageExploratoryService.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/service/ShapeFormat.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/service/aws/AwsBillingService.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/SchedulerJobServiceImpl.java
#	services/self-service/src/main/resources/webapp/browserslist
#	services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts
#	services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
#	services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts
#	services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts
#	services/self-service/src/test/java/com/epam/dlab/backendapi/service/aws/AwsBillingServiceTest.java
#	services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImplTest.java
#	services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ImageExploratoryServiceImplTest.java