You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by of...@apache.org on 2020/01/21 15:48:19 UTC

[incubator-dlab] 01/02: Merge branch 'develop' into multiple-cloud

This is an automated email from the ASF dual-hosted git repository.

ofuks pushed a commit to branch multiple-cloud
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit 3e3bdab12a8136fe35ca559281d1ee56e05fa574
Merge: 10d176e d2664ce
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Tue Jan 21 16:50:04 2020 +0200

    Merge branch 'develop' into multiple-cloud
    
    # Conflicts:
    #	services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
    #	services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
    #	services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts

 README.md                                          |   30 +-
 infrastructure-provisioning/scripts/deploy_dlab.py |    5 +
 .../scripts/deploy_repository/deploy_repository.py |   16 +-
 .../src/general/conf/dlab.ini                      |   12 +-
 .../src/general/files/aws/project_Dockerfile       |    2 +
 .../src/general/files/aws/ssn_Dockerfile           |    3 +
 .../src/general/files/azure/project_Dockerfile     |    2 +
 .../src/general/files/azure/ssn_Dockerfile         |    3 +
 .../src/general/files/gcp/project_Dockerfile       |    2 +
 .../src/general/files/gcp/ssn_Dockerfile           |    4 +
 .../src/general/lib/aws/actions_lib.py             |    4 +-
 .../src/general/lib/azure/actions_lib.py           |   12 +-
 .../src/general/lib/gcp/actions_lib.py             |    2 +-
 .../src/general/lib/os/debian/common_lib.py        |   22 +
 .../src/general/lib/os/debian/edge_lib.py          |   58 +-
 .../src/general/lib/os/debian/ssn_lib.py           |   28 +-
 .../src/general/lib/os/fab.py                      |   14 +-
 .../src/general/lib/os/redhat/common_lib.py        |   24 +-
 .../src/general/lib/os/redhat/edge_lib.py          |   46 +-
 .../src/general/lib/os/redhat/ssn_lib.py           |   30 +-
 .../scripts/aws/dataengine-service_configure.py    |    6 +-
 .../scripts/aws/dataengine-service_jars_parser.py  |   25 +
 .../general/scripts/aws/dataengine_configure.py    |    5 +-
 .../general/scripts/aws/deeplearning_configure.py  |   12 +-
 .../src/general/scripts/aws/edge_configure.py      |   31 +-
 .../src/general/scripts/aws/jupyter_configure.py   |   12 +-
 .../jupyter_dataengine-service_create_configs.py   |   31 +-
 .../jupyter_install_dataengine-service_kernels.py  |   24 +-
 .../src/general/scripts/aws/project_prepare.py     |    6 +
 .../src/general/scripts/aws/rstudio_configure.py   |    8 +-
 .../src/general/scripts/aws/ssn_configure.py       |   87 +-
 .../scripts/aws/tensor-rstudio_configure.py        |   18 +-
 .../src/general/scripts/aws/tensor_configure.py    |   18 +-
 .../src/general/scripts/aws/zeppelin_configure.py  |    8 +-
 .../general/scripts/azure/dataengine_configure.py  |    4 +-
 .../scripts/azure/deeplearning_configure.py        |   12 +-
 .../src/general/scripts/azure/edge_configure.py    |   45 +-
 .../src/general/scripts/azure/jupyter_configure.py |    8 +-
 .../src/general/scripts/azure/project_prepare.py   |   11 +
 .../src/general/scripts/azure/rstudio_configure.py |    8 +-
 .../src/general/scripts/azure/ssn_configure.py     |   87 +-
 .../src/general/scripts/azure/tensor_configure.py  |   12 +-
 .../general/scripts/azure/zeppelin_configure.py    |    8 +-
 .../scripts/gcp/dataengine-service_configure.py    |    4 +-
 .../scripts/gcp/dataengine-service_jars_parser.py  |    6 +
 .../general/scripts/gcp/dataengine_configure.py    |    4 +-
 .../general/scripts/gcp/deeplearning_configure.py  |   12 +-
 .../src/general/scripts/gcp/edge_configure.py      |   36 +-
 .../src/general/scripts/gcp/jupyter_configure.py   |   12 +-
 .../jupyter_dataengine-service_create_configs.py   |    4 +-
 .../jupyter_install_dataengine-service_kernels.py  |    8 +-
 .../src/general/scripts/gcp/project_prepare.py     |    2 +-
 .../src/general/scripts/gcp/rstudio_configure.py   |    8 +-
 .../src/general/scripts/gcp/ssn_configure.py       |   73 +-
 .../scripts/gcp/tensor-rstudio_configure.py        |   12 +-
 .../src/general/scripts/gcp/tensor_configure.py    |   12 +-
 .../src/general/scripts/gcp/zeppelin_configure.py  |    8 +-
 .../os/jupyter_dataengine_create_configs.py        |    2 +-
 .../general/templates/aws/interpreter_livy.json    |    2 +-
 .../general/templates/aws/interpreter_spark.json   |    2 +-
 .../general/templates/azure/interpreter_livy.json  |    2 +-
 .../general/templates/azure/interpreter_spark.json |    2 +-
 .../general/templates/gcp/interpreter_livy.json    |    2 +-
 .../general/templates/gcp/interpreter_spark.json   |    2 +-
 .../src/general/templates/os/manage_step_certs.sh  |   86 ++
 .../src/general/templates/os/renew_certificates.sh |   43 +
 .../general/templates/os/step-cert-manager.service |   14 +-
 .../src/jupyter/scripts/configure_jupyter_node.py  |    3 +-
 .../src/project/scripts/configure_keycloak.py      |   14 +-
 .../scripts/configure_nginx_reverse_proxy.py       |   13 +-
 .../src/project/templates/conf.d/proxy.conf        |   25 +-
 .../src/ssn/scripts/configure_ssn_node.py          |   62 +-
 .../src/ssn/templates/nginx_proxy.conf             |    4 +-
 .../src/ssn/templates/ssn.yml                      |    2 +-
 .../terraform/aws/endpoint/main/iam.tf             |    8 +-
 .../terraform/aws/endpoint/main/instance.tf        |    2 +-
 .../terraform/aws/endpoint/main/network.tf         |   35 +-
 .../nginx_values.yaml => endpoint/main/outputs.tf} |    9 +-
 .../outputs.tf => aws/endpoint/main/s3.tf}         |   23 +-
 .../terraform/aws/endpoint/main/variables.tf       |    6 +-
 .../.helmignore}                                   |   31 +-
 .../Chart.yaml}                                    |   11 +-
 .../templates/NOTES.txt}                           |   12 +-
 .../cert-manager-crd-chart/templates/_helpers.tpl  |   65 +
 .../main/cert-manager-crd-chart/templates/crd.yaml | 1449 ++++++++++++++++++++
 .../values.yaml}                                   |   11 +-
 .../main/{dlab-ui.tf => cert-manager.tf}           |   47 +-
 .../aws/ssn-helm-charts/main/dlab-billing.tf       |   15 +-
 .../main/dlab-ui-chart/templates/cert.yaml         |   64 +
 .../dlab-ui-chart/templates/configmap-ui-conf.yaml |   23 +-
 .../main/dlab-ui-chart/templates/deployment.yaml   |    8 +-
 .../main/dlab-ui-chart/templates/service.yaml      |    1 -
 .../ssn-helm-charts/main/dlab-ui-chart/values.yaml |   28 +-
 .../terraform/aws/ssn-helm-charts/main/dlab-ui.tf  |   32 +-
 ...{nginx_values.yaml => cert_manager_values.yaml} |    8 +-
 .../main/files/configure_keycloak.sh               |   23 +-
 .../main/files/dlab/login/resources/css/login.css  |  473 -------
 .../files/dlab/login/resources/img/favicon.ico     |  Bin 4286 -> 0 bytes
 .../resources/img/feedback-error-arrow-down.png    |  Bin 513 -> 0 bytes
 .../login/resources/img/feedback-error-sign.png    |  Bin 343 -> 0 bytes
 .../resources/img/feedback-success-arrow-down.png  |  Bin 678 -> 0 bytes
 .../login/resources/img/feedback-success-sign.png  |  Bin 410 -> 0 bytes
 .../resources/img/feedback-warning-arrow-down.png  |  Bin 513 -> 0 bytes
 .../login/resources/img/feedback-warning-sign.png  |  Bin 646 -> 0 bytes
 .../dlab/login/resources/img/keycloak-logo.png     |  Bin 5281 -> 0 bytes
 .../dlab/login/resources/img/login-background.png  |  Bin 191866 -> 0 bytes
 .../files/dlab/login/resources/img/login-icons.png |  Bin 3934 -> 0 bytes
 .../main/files/dlab/login/resources/img/logo.png   |  Bin 5268 -> 0 bytes
 .../main/files/dlab/login/theme.properties         |   69 -
 .../main/files/keycloak_values.yaml                |   12 +-
 .../ssn-helm-charts/main/files/mongo_values.yaml   |    4 +-
 .../main/files/mysql_keycloak_values.yaml          |    5 +-
 .../ssn-helm-charts/main/files/nginx_values.yaml   |    5 +-
 .../terraform/aws/ssn-helm-charts/main/keycloak.tf |   14 +-
 .../terraform/aws/ssn-helm-charts/main/main.tf     |   40 +-
 .../terraform/aws/ssn-helm-charts/main/mongo.tf    |   17 +-
 .../terraform/aws/ssn-helm-charts/main/mysql.tf    |   49 +-
 .../terraform/aws/ssn-helm-charts/main/nginx.tf    |   11 +-
 .../ssn-helm-charts/main}/outputs.tf               |   44 +-
 .../terraform/aws/ssn-helm-charts/main/secrets.tf  |   56 +-
 .../ssn-helm-charts/main/step-ca-chart/.helmignore |   22 +
 .../ssn-helm-charts/main/step-ca-chart/Chart.yaml  |   31 +
 .../main/step-ca-chart/templates/NOTES.txt         |   13 +
 .../main/step-ca-chart/templates/_helpers.tpl      |   67 +
 .../main/step-ca-chart/templates/bootstrap.yaml    |   39 +
 .../main/step-ca-chart/templates/ca.yaml           |  137 ++
 .../main/step-ca-chart/templates/configmaps.yaml   |  146 ++
 .../main/step-ca-chart/templates/ingress.yaml      |   36 +
 .../main/step-ca-chart/templates/rbac.yaml         |   72 +
 .../main/step-ca-chart/templates/secrets.yaml      |   18 +
 .../main/step-ca-chart/templates/service.yaml      |   19 +
 .../templates/tests/test-connection.yaml           |   15 +
 .../ssn-helm-charts/main/step-ca-chart/values.yaml |  103 ++
 .../{nginx.tf => step-ca-issuer-chart/.helmignore} |   31 +-
 .../Chart.yaml}                                    |   11 +-
 .../templates/NOTES.txt}                           |   12 +-
 .../step-ca-issuer-chart/templates/_helpers.tpl    |   65 +
 .../templates/stepissuer.yaml}                     |   22 +-
 .../main/step-ca-issuer-chart/values.yaml          |   14 +-
 .../ssn-helm-charts/main/step-ca.tf}               |   41 +-
 .../{nginx.tf => step-issuer-chart/.helmignore}    |   31 +-
 .../Chart.yaml}                                    |   11 +-
 .../templates/NOTES.txt}                           |   12 +-
 .../main/step-issuer-chart/templates/_helpers.tpl  |   65 +
 .../step-issuer-chart/templates/deployment.yaml    |  360 +++++
 .../values.yaml}                                   |   11 +-
 .../aws/ssn-helm-charts/main/step-issuer.tf        |   80 ++
 .../aws/ssn-helm-charts/main/variables.tf          |   58 +-
 .../aws/ssn-k8s/main/auto_scaling_groups.tf        |   31 +-
 .../aws/ssn-k8s/main/files/masters-user-data.sh    |   81 +-
 .../aws/ssn-k8s/main/files/ssn-policy.json.tpl     |    4 +-
 .../aws/ssn-k8s/main/files/workers-user-data.sh    |   26 +-
 .../terraform/aws/ssn-k8s/main/lb.tf               |   89 +-
 .../terraform/aws/ssn-k8s/main/main.tf             |   70 -
 .../aws/ssn-k8s/main/{main.tf => outputs.tf}       |   28 +-
 .../terraform/aws/ssn-k8s/main/role_policy.tf      |    9 +-
 .../terraform/aws/ssn-k8s/main/s3.tf               |   22 +-
 .../terraform/aws/ssn-k8s/main/security_groups.tf  |   30 +-
 .../terraform/aws/ssn-k8s/main/variables.tf        |    2 +-
 .../terraform/aws/ssn-k8s/main/vpc.tf              |  102 +-
 .../terraform/bin/deploy/endpoint_fab.py           |  428 ++++--
 .../terraform/bin/deploy/manage_step_certs.sh      |   86 ++
 .../terraform/bin/deploy/provisioning.yml          |  371 ++---
 .../terraform/bin/deploy/renew_certificates.sh     |   43 +
 .../terraform/bin/deploy/step-cert-manager.service |   14 +-
 .../terraform/bin/deploy/supervisor_svc.conf       |    2 +-
 infrastructure-provisioning/terraform/bin/dlab.py  |  309 ++++-
 .../outputs.tf => endpoint/main/buckets.tf}        |   23 +-
 .../terraform/gcp/endpoint/main/iam.tf             |    8 +-
 .../terraform/gcp/endpoint/main/instance.tf        |   22 +-
 .../terraform/gcp/endpoint/main/main.tf            |    2 +-
 .../terraform/gcp/endpoint/main/network.tf         |   18 +-
 .../endpoint/main/outputs.tf}                      |    9 +-
 .../terraform/gcp/endpoint/main/variables.tf       |   24 +-
 .../terraform/gcp/endpoint/provisioning.py         |    2 +-
 .../terraform/gcp/ssn-gke/main/main.tf             |   81 +-
 .../gcp/ssn-gke/main/modules/gke/buckets.tf        |   11 -
 .../terraform/gcp/ssn-gke/main/modules/gke/gke.tf  |   28 +-
 .../terraform/gcp/ssn-gke/main/modules/gke/iam.tf  |   11 +-
 .../cert-manager-crd-chart/.helmignore}            |   31 +-
 .../helm_charts/cert-manager-crd-chart/Chart.yaml} |   11 +-
 .../cert-manager-crd-chart/templates/NOTES.txt}    |   12 +-
 .../cert-manager-crd-chart/templates/_helpers.tpl  |   65 +
 .../cert-manager-crd-chart/templates/crd.yaml      | 1449 ++++++++++++++++++++
 .../cert-manager-crd-chart/values.yaml}            |   11 +-
 .../main/modules/helm_charts/cert-manager.tf       |   64 +
 .../main/modules/helm_charts/dlab-billing.tf       |    9 +-
 .../helm_charts/dlab-ui-chart/templates/cert.yaml  |   64 +
 .../dlab-ui-chart/templates/configmap-ui-conf.yaml |   25 +-
 .../dlab-ui-chart/templates/deployment.yaml        |    6 +
 .../dlab-ui-chart/templates/ingress.yaml           |   22 +-
 .../modules/helm_charts/dlab-ui-chart/values.yaml  |   30 +-
 .../ssn-gke/main/modules/helm_charts/dlab-ui.tf    |   28 +-
 .../helm_charts/{nginx.tf => external-dns.tf}      |   27 +-
 .../modules/helm_charts/external-dns/.helmignore}  |   31 +-
 .../modules/helm_charts/external-dns/Chart.yaml}   |   11 +-
 .../helm_charts/external-dns/templates/NOTES.txt}  |   12 +-
 .../external-dns/templates/_helpers.tpl            |   65 +
 .../external-dns/templates/externaldns.yaml        |   82 ++
 .../modules/helm_charts/external-dns/values.yaml}  |   10 +-
 .../helm_charts/files/cert_manager_values.yaml}    |    8 +-
 .../helm_charts/files/configure_keycloak.sh        |   22 +-
 .../dlab/login/resources/img/login-background.png  |  Bin 191866 -> 0 bytes
 .../helm_charts/files/get_configmap_values.sh      |   15 +
 .../modules/helm_charts/files/keycloak_values.yaml |   13 +-
 .../modules/helm_charts/files/mongo_values.yaml    |    2 +-
 .../modules/helm_charts/files/mysql_values.yaml    |    5 +
 .../modules/helm_charts/files/nginx_values.yaml    |    3 -
 .../ssn-gke/main/modules/helm_charts/keycloak.tf   |   46 +-
 .../gcp/ssn-gke/main/modules/helm_charts/main.tf   |   29 +-
 .../gcp/ssn-gke/main/modules/helm_charts/mongo.tf  |   12 +-
 .../gcp/ssn-gke/main/modules/helm_charts/mysql.tf  |   50 +-
 .../helm_charts/nginx-default-backend/.helmignore} |   31 +-
 .../helm_charts/nginx-default-backend/Chart.yaml}  |   11 +-
 .../nginx-default-backend/templates/NOTES.txt}     |   12 +-
 .../nginx-default-backend/templates/_helpers.tpl   |   65 +
 .../templates/nginx-default-backend.yaml}          |   42 +-
 .../helm_charts/nginx-default-backend/values.yaml} |    8 +-
 .../modules/helm_charts/nginx-ingress/.helmignore} |   31 +-
 .../modules/helm_charts/nginx-ingress/Chart.yaml}  |   11 +-
 .../helm_charts/nginx-ingress/templates/NOTES.txt} |   12 +-
 .../nginx-ingress/templates/_helpers.tpl           |   65 +
 .../nginx-ingress/templates/nginx-ingress.yaml}    |   56 +-
 .../modules/helm_charts/nginx-ingress/values.yaml} |    8 +-
 .../gcp/ssn-gke/main/modules/helm_charts/nginx.tf  |   37 +-
 .../ssn-gke/main/modules/helm_charts/outputs.tf    |   35 +-
 .../ssn-gke/main/modules/helm_charts/secrets.tf    |   62 +-
 .../modules/helm_charts/step-ca-chart/.helmignore  |   22 +
 .../modules/helm_charts/step-ca-chart/Chart.yaml   |   31 +
 .../helm_charts/step-ca-chart/templates/NOTES.txt  |   13 +
 .../step-ca-chart/templates/_helpers.tpl           |   67 +
 .../step-ca-chart/templates/bootstrap.yaml         |   39 +
 .../helm_charts/step-ca-chart/templates/ca.yaml    |  138 ++
 .../step-ca-chart/templates/configmaps.yaml        |  146 ++
 .../step-ca-chart/templates/ingress.yaml           |   36 +
 .../helm_charts/step-ca-chart/templates/rbac.yaml  |   72 +
 .../step-ca-chart/templates/secrets.yaml           |   18 +
 .../step-ca-chart/templates/service.yaml           |   19 +
 .../templates/tests/test-connection.yaml           |   15 +
 .../modules/helm_charts/step-ca-chart/values.yaml  |  104 ++
 .../helm_charts/step-ca-issuer-chart/.helmignore}  |   31 +-
 .../helm_charts/step-ca-issuer-chart/Chart.yaml}   |   11 +-
 .../step-ca-issuer-chart/templates/NOTES.txt}      |   12 +-
 .../step-ca-issuer-chart/templates/_helpers.tpl    |   65 +
 .../templates/stepissuer.yaml}                     |   22 +-
 .../helm_charts/step-ca-issuer-chart/values.yaml   |   14 +-
 .../ssn-gke/main/modules/helm_charts/step-ca.tf    |   78 ++
 .../helm_charts/step-issuer-chart/.helmignore}     |   31 +-
 .../helm_charts/step-issuer-chart/Chart.yaml}      |   11 +-
 .../step-issuer-chart/templates/NOTES.txt}         |   12 +-
 .../step-issuer-chart/templates/_helpers.tpl       |   65 +
 .../step-issuer-chart/templates/deployment.yaml    |  360 +++++
 .../helm_charts/step-issuer-chart/values.yaml}     |   11 +-
 .../main/modules/helm_charts/step-issuer.tf        |   81 ++
 .../ssn-gke/main/modules/helm_charts/variables.tf  |   34 +-
 .../terraform/gcp/ssn-gke/main/outputs.tf          |   48 +-
 .../terraform/gcp/ssn-gke/main/variables.tf        |   64 +-
 .../Dockerfile}                                    |    8 +-
 .../dlab/login/resources/css/login.css             |   28 +-
 .../dlab/login/resources/img/favicon.ico           |  Bin
 .../resources/img/feedback-error-arrow-down.png    |  Bin
 .../login/resources/img/feedback-error-sign.png    |  Bin
 .../resources/img/feedback-success-arrow-down.png  |  Bin
 .../login/resources/img/feedback-success-sign.png  |  Bin
 .../resources/img/feedback-warning-arrow-down.png  |  Bin
 .../login/resources/img/feedback-warning-sign.png  |  Bin
 .../dlab/login/resources/img/keycloak-logo.png     |  Bin
 .../dlab/login/resources/img/login-background.png  |  Bin 0 -> 209027 bytes
 .../dlab/login/resources/img/login-background1.png |  Bin 0 -> 209142 bytes
 .../dlab/login/resources/img/login-icons.png       |  Bin
 .../dlab/login/resources/img/logo.png              |  Bin
 .../dlab/login/theme.properties                    |    0
 services/billing-aws/Dockerfile                    |    4 +-
 services/billing-gcp/Dockerfile                    |    4 +-
 .../com/epam/dlab/dto/aws/AwsCloudSettings.java    |   18 +
 .../epam/dlab/dto/azure/AzureCloudSettings.java    |   18 +
 .../com/epam/dlab/dto/gcp/GcpCloudSettings.java    |   18 +
 services/provisioning-service/provisioning.yml     |   17 +-
 .../epam/dlab/backendapi/CloudConfiguration.java   |   22 +
 .../backendapi/core/commands/CommandBuilder.java   |   47 +-
 .../self-service/{Dockerfile_aws => Dockerfile}    |    9 +-
 services/self-service/Dockerfile_gcp               |   37 -
 services/self-service/entrypoint.sh                |   35 +
 services/self-service/entrypoint_aws.sh            |   12 -
 services/self-service/entrypoint_gcp.sh            |   14 -
 services/self-service/self-service.yml             |    8 +-
 .../management/endpoints/endpoints.component.html  |   13 +-
 .../management/endpoints/endpoints.component.scss  |  112 +-
 .../management/endpoints/endpoints.component.ts    |   18 +-
 .../management-grid/management-grid.component.html |    2 +-
 .../management-grid/management-grid.component.scss |    3 +-
 .../project/project-form/project-form.component.ts |    2 +-
 .../app/administration/roles/roles.component.html  |    6 +-
 .../app/administration/roles/roles.component.ts    |    3 +-
 .../resources/webapp/src/app/core/util/patterns.ts |    5 +-
 .../src/app/reporting/reporting.component.ts       |    4 +-
 ...utational-resource-create-dialog.component.html |    6 +-
 .../create-environment.component.html              |   11 +-
 .../resources-grid/resources-grid.component.html   |    9 +-
 .../resources-grid/resources-grid.component.scss   |    4 +-
 .../src/app/shared/navbar/navbar.component.html    |   14 +-
 .../src/app/shared/navbar/navbar.component.scss    |   12 +-
 .../webapp/src/app/swagger/swagger.component.ts    |   20 +-
 .../webapp/src/assets/styles/_dialogs.scss         |    2 +-
 .../webapp/src/assets/styles/_general.scss         |    5 +-
 .../resources/webapp/src/assets/styles/_reset.scss |    2 +-
 .../resources/webapp/src/assets/styles/_theme.scss |   23 +-
 307 files changed, 9953 insertions(+), 2572 deletions(-)

diff --cc services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
index 8daf498,0bbc0e8..3cae0dc
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
@@@ -121,10 -120,10 +121,10 @@@
  
              <div class="control-group" *ngIf="selectedImage?.image"
                [hidden]="selectedImage?.image === 'docker.dlab-dataengine'">
 -              <label class="label">{{ DICTIONARY[selectedImage.image].data_engine_slave_instance_size }}</label>
 +              <label class="label">Slave instance size</label>
                <div class="control selector-wrapper">
                  <mat-form-field>
-                   <mat-label>Select instance size</mat-label>
+                   <mat-label>Select cluster type</mat-label>
                    <mat-select formControlName="shape_slave" disableOptionCentering>
                      <mat-optgroup *ngFor="let item of (selectedImage.computation_resources_shapes | keys)"
                        [label]="item.key | underscoreless">
diff --cc services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
index d532a10,45bc68d..a598cec
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
@@@ -121,12 -117,11 +118,12 @@@
          </div>
  
          <div class="control-group">
 -          <label class="label">{{ DICTIONARY.notebook_instance_size }}</label>
 +          <label class="label">Instance size</label>
            <div class="control selector-wrapper" [ngClass]="{ 'not-active': !currentTemplate }">
              <mat-form-field>
 +              <mat-label>Select instance size</mat-label>
                <mat-select formControlName="shape" disableOptionCentering [disabled]="!currentTemplate"
-                 panelClass="create-resources-shapes">
+                 panelClass="create-resources-shapes" placeholder="Instance size">
                  <mat-optgroup *ngFor="let item of (shapes | keys)" [label]="item.key | underscoreless">
                    <mat-option *ngFor="let list_item of item.value" [value]="list_item.Type">
                      <strong class="highlight icon-label">{{ list_item.Size }}</strong> {{ list_item.Type }}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org