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
diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 0000000..4195022
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,4 @@
+github:
+ ghp_branch: gh-pages
+publish:
+ whoami: gh-pages
diff --git a/doc/gcp_dlab.png b/doc/gcp_dlab.png
new file mode 100644
index 0000000..23120ed
--- /dev/null
+++ b/doc/gcp_dlab.png
Binary files differ
diff --git a/infrastructure-provisioning/terraform/aws/computational_resources/modules/ami/variables.tf b/infrastructure-provisioning/terraform/aws/computational_resources/modules/ami/variables.tf
deleted file mode 100644
index 0402960..0000000
--- a/infrastructure-provisioning/terraform/aws/computational_resources/modules/ami/variables.tf
+++ /dev/null
@@ -1,39 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-
-variable "project_name" {}
-
-variable "sbn" {}
-
-variable "source_instance_id" {}
-
-variable "project_tag" {}
-
-variable "notebook_name" {}
-
-variable "product" {}
-
-variable "endpoint_tag" {}
-
-variable "user_tag" {}
-
-variable "custom_tag" {}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/computational_resources/modules/common/variables.tf b/infrastructure-provisioning/terraform/aws/computational_resources/modules/common/variables.tf
deleted file mode 100644
index 169b77e..0000000
--- a/infrastructure-provisioning/terraform/aws/computational_resources/modules/common/variables.tf
+++ /dev/null
@@ -1,48 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-variable "project_name" {}
-
-variable "sbn" {}
-
-variable "project_tag" {}
-
-variable "endpoint_tag" {}
-
-variable "user_tag" {}
-
-variable "custom_tag" {}
-
-variable "notebook_name" {}
-
-variable "region" {}
-
-variable "zone" {}
-
-variable "product" {}
-
-variable "vpc" {}
-
-variable "cidr_range" {}
-
-variable "traefik_cidr" {}
-
-variable "instance_type" {}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/computational_resources/modules/data_engine/variables.tf b/infrastructure-provisioning/terraform/aws/computational_resources/modules/data_engine/variables.tf
deleted file mode 100644
index c83a942..0000000
--- a/infrastructure-provisioning/terraform/aws/computational_resources/modules/data_engine/variables.tf
+++ /dev/null
@@ -1,52 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-variable "project_name" {}
-
-variable "sbn" {}
-
-variable "project_tag" {}
-
-variable "endpoint_tag" {}
-
-variable "user_tag" {}
-
-variable "custom_tag" {}
-
-variable "notebook_name" {}
-
-variable "product" {}
-
-variable "ami" {}
-
-variable "instance_type" {}
-
-variable "key_name" {}
-
-variable "subnet_id" {}
-
-variable "nb-sg_id" {}
-
-variable "iam_profile_name" {}
-
-variable "cluster_name" {}
-
-variable "slave_count" {}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/computational_resources/modules/emr/variables.tf b/infrastructure-provisioning/terraform/aws/computational_resources/modules/emr/variables.tf
deleted file mode 100644
index c8c2ae1..0000000
--- a/infrastructure-provisioning/terraform/aws/computational_resources/modules/emr/variables.tf
+++ /dev/null
@@ -1,59 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-variable "project_name" {}
-
-variable "sbn" {}
-
-variable "project_tag" {}
-
-variable "endpoint_tag" {}
-
-variable "user_tag" {}
-
-variable "custom_tag" {}
-
-variable "notebook_name" {}
-
-variable "product" {}
-
-variable "ami" {}
-
-variable "emr_template" {}
-
-variable "master_shape" {}
-
-variable "slave_shape" {}
-
-variable "key_name" {}
-
-variable "subnet_id" {}
-
-variable "nb-sg_id" {}
-
-variable "iam_profile_name" {}
-
-variable "cluster_name" {}
-
-variable "instance_count" {}
-
-variable "bid_price" {}
-
diff --git a/infrastructure-provisioning/terraform/aws/computational_resources/modules/notebook/variables.tf b/infrastructure-provisioning/terraform/aws/computational_resources/modules/notebook/variables.tf
deleted file mode 100644
index 50c5487..0000000
--- a/infrastructure-provisioning/terraform/aws/computational_resources/modules/notebook/variables.tf
+++ /dev/null
@@ -1,48 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-variable "project_name" {}
-
-variable "sbn" {}
-
-variable "project_tag" {}
-
-variable "endpoint_tag" {}
-
-variable "user_tag" {}
-
-variable "custom_tag" {}
-
-variable "notebook_name" {}
-
-variable "product" {}
-
-variable "ami" {}
-
-variable "instance_type" {}
-
-variable "key_name" {}
-
-variable "subnet_id" {}
-
-variable "nb-sg_id" {}
-
-variable "iam_profile_name" {}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/endpoint/main/README.md b/infrastructure-provisioning/terraform/aws/endpoint/main/README.md
deleted file mode 100644
index a661513..0000000
--- a/infrastructure-provisioning/terraform/aws/endpoint/main/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Terraform module for deploying DLab Endpoint instance
-
-List of variables which should be provided:
-
-| Variable | Type | Description/Value |
-|--------------------------|--------|-----------------------------------------------------------------------------------------------------------------------------------------------------|
-| service\_base\_name | string | Any infrastructure value (should be unique if multiple SSN’s have been deployed before). Should be same as on ssn |
-| vpc\_id | string | ID of AWS VPC if you already have VPC created. |
-| vpc\_cidr | string | CIDR for VPC creation. Conflicts with _vpc\_id_. Default: 172.31.0.0/16 |
-| subnet\_id | string | ID of AWS Subnet if you already have subnet created. |
-| subnet\_cidr | string | CIDR for Subnet creation. Conflicts with _subnet\_id_. Default: 172.31.0.0/24 |
-| ami | string | **Required** ID of EC2 AMI. Default ubuntu 18.04.1 (debian os): "ami-08692d171e3cf02d6" (aws ami: 258751437250/ami-ubuntu-18.04-1.13.0-00-1543963388|
-| key\_name | string | **Required** Name of EC2 Key pair. (Existed on AWS account) |
-| region | string | Name of AWS region. Default: us-west-2 |
-| zone | string | Name of AWS zone. Default: a |
-| endpoint\_volume\_size | int | Size of root volume in GB. Default: 30 |
-| network\_type | string | Type of created network (if network is not existed and require creation) for endpoint. Default: public |
-| endpoint\_instance\_shape| string | Instance shape of Endpoint. Default: t2.medium |
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/endpoint/main/files/assume-policy.json b/infrastructure-provisioning/terraform/aws/endpoint/main/files/assume-policy.json
deleted file mode 100644
index 680b6f8..0000000
--- a/infrastructure-provisioning/terraform/aws/endpoint/main/files/assume-policy.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "Version": "2012-10-17",
- "Statement": [
- {
- "Action": "sts:AssumeRole",
- "Principal": {
- "Service": "ec2.amazonaws.com"
- },
- "Effect": "Allow",
- "Sid": ""
- }
- ]
-}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/endpoint/main/files/endpoint-policy.json b/infrastructure-provisioning/terraform/aws/endpoint/main/files/endpoint-policy.json
deleted file mode 100644
index 89f28c5..0000000
--- a/infrastructure-provisioning/terraform/aws/endpoint/main/files/endpoint-policy.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
- "Version": "2012-10-17",
- "Statement": [
- {
- "Action": [
- "iam:CreateRole",
- "iam:CreateInstanceProfile",
- "iam:CreatePolicy",
- "iam:AttachRolePolicy",
- "iam:AddRoleToInstanceProfile",
- "iam:DetachRolePolicy",
- "iam:DeleteInstanceProfile",
- "iam:DeletePolicy",
- "iam:DeleteRolePolicy",
- "iam:DeleteRole",
- "iam:RemoveRoleFromInstanceProfile",
- "iam:GetRole",
- "iam:GetRolePolicy",
- "iam:GetInstanceProfile",
- "iam:GetPolicy",
- "iam:GetUser",
- "iam:ListUsers",
- "iam:ListAccessKeys",
- "iam:PassRole",
- "iam:ListUserPolicies",
- "iam:PutRolePolicy",
- "iam:ListInstanceProfiles",
- "iam:ListAttachedRolePolicies",
- "iam:ListInstanceProfilesForRole",
- "iam:ListRoles",
- "iam:ListPolicies",
- "iam:ListRolePolicies",
- "iam:TagRole"
- ],
- "Effect": "Allow",
- "Resource": "*"
- },
- {
- "Action": [
- "ec2:CreateVpcEndpoint",
- "ec2:CreateSubnet",
- "ec2:CreateTags",
- "ec2:CreateImage",
- "ec2:CreateRoute",
- "ec2:DeregisterImage",
- "ec2:DescribeImages",
- "ec2:DescribeAddresses",
- "ec2:AssociateAddress",
- "ec2:DisassociateAddress",
- "ec2:AllocateAddress",
- "ec2:ReleaseAddress",
- "ec2:CreateRouteTable",
- "ec2:CreateSecurityGroup",
- "ec2:AuthorizeSecurityGroupEgress",
- "ec2:AuthorizeSecurityGroupIngress",
- "ec2:AssociateRouteTable",
- "ec2:DeleteRouteTable",
- "ec2:DeleteSubnet",
- "ec2:DeleteTags",
- "ec2:DeleteSecurityGroup",
- "ec2:DeleteSnapshot",
- "ec2:DescribeRouteTables",
- "ec2:DescribeSpotInstanceRequests",
- "ec2:ModifyVpcEndpoint",
- "ec2:RunInstances",
- "ec2:StartInstances",
- "ec2:StopInstances",
- "ec2:TerminateInstances",
- "ec2:DescribeSubnets",
- "ec2:DescribeVpcs",
- "ec2:DescribeSecurityGroups",
- "ec2:DescribeInstances",
- "ec2:DescribeInstanceStatus",
- "ec2:ModifyInstanceAttribute",
- "ec2:RevokeSecurityGroupEgress",
- "ec2:RevokeSecurityGroupIngress",
- "ec2:AuthorizeSecurityGroupEgress",
- "ec2:AuthorizeSecurityGroupIngress"
- ],
- "Effect": "Allow",
- "Resource": "*"
- },
- {
- "Action": [
- "s3:CreateBucket",
- "s3:ListAllMyBuckets",
- "s3:GetBucketLocation",
- "s3:GetBucketTagging",
- "s3:PutBucketTagging",
- "s3:PutBucketPolicy",
- "s3:GetBucketPolicy",
- "s3:DeleteBucket",
- "s3:DeleteObject",
- "s3:GetObject",
- "s3:ListBucket",
- "s3:PutObject",
- "s3:PutEncryptionConfiguration"
- ],
- "Effect": "Allow",
- "Resource": "*"
- },
- {
- "Action": [
- "elasticmapreduce:AddTags",
- "elasticmapreduce:RemoveTags",
- "elasticmapreduce:DescribeCluster",
- "elasticmapreduce:ListClusters",
- "elasticmapreduce:RunJobFlow",
- "elasticmapreduce:ListInstances",
- "elasticmapreduce:TerminateJobFlows"
- ],
- "Effect": "Allow",
- "Resource": "*"
- },
- {
- "Action": [
- "pricing:GetProducts"
- ],
- "Effect": "Allow",
- "Resource": "*"
- }
- ]
-}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/endpoint/main/main.tf b/infrastructure-provisioning/terraform/aws/endpoint/main/main.tf
deleted file mode 100644
index 56d5374..0000000
--- a/infrastructure-provisioning/terraform/aws/endpoint/main/main.tf
+++ /dev/null
@@ -1,26 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-provider "aws" {
- region = var.region
- access_key = var.access_key_id
- secret_key = var.secret_access_key
-}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/project/main/files/edge-assume-policy.json b/infrastructure-provisioning/terraform/aws/project/main/files/edge-assume-policy.json
deleted file mode 100644
index 680b6f8..0000000
--- a/infrastructure-provisioning/terraform/aws/project/main/files/edge-assume-policy.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "Version": "2012-10-17",
- "Statement": [
- {
- "Action": "sts:AssumeRole",
- "Principal": {
- "Service": "ec2.amazonaws.com"
- },
- "Effect": "Allow",
- "Sid": ""
- }
- ]
-}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/project/main/files/edge-policy.json b/infrastructure-provisioning/terraform/aws/project/main/files/edge-policy.json
deleted file mode 100644
index 89f28c5..0000000
--- a/infrastructure-provisioning/terraform/aws/project/main/files/edge-policy.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
- "Version": "2012-10-17",
- "Statement": [
- {
- "Action": [
- "iam:CreateRole",
- "iam:CreateInstanceProfile",
- "iam:CreatePolicy",
- "iam:AttachRolePolicy",
- "iam:AddRoleToInstanceProfile",
- "iam:DetachRolePolicy",
- "iam:DeleteInstanceProfile",
- "iam:DeletePolicy",
- "iam:DeleteRolePolicy",
- "iam:DeleteRole",
- "iam:RemoveRoleFromInstanceProfile",
- "iam:GetRole",
- "iam:GetRolePolicy",
- "iam:GetInstanceProfile",
- "iam:GetPolicy",
- "iam:GetUser",
- "iam:ListUsers",
- "iam:ListAccessKeys",
- "iam:PassRole",
- "iam:ListUserPolicies",
- "iam:PutRolePolicy",
- "iam:ListInstanceProfiles",
- "iam:ListAttachedRolePolicies",
- "iam:ListInstanceProfilesForRole",
- "iam:ListRoles",
- "iam:ListPolicies",
- "iam:ListRolePolicies",
- "iam:TagRole"
- ],
- "Effect": "Allow",
- "Resource": "*"
- },
- {
- "Action": [
- "ec2:CreateVpcEndpoint",
- "ec2:CreateSubnet",
- "ec2:CreateTags",
- "ec2:CreateImage",
- "ec2:CreateRoute",
- "ec2:DeregisterImage",
- "ec2:DescribeImages",
- "ec2:DescribeAddresses",
- "ec2:AssociateAddress",
- "ec2:DisassociateAddress",
- "ec2:AllocateAddress",
- "ec2:ReleaseAddress",
- "ec2:CreateRouteTable",
- "ec2:CreateSecurityGroup",
- "ec2:AuthorizeSecurityGroupEgress",
- "ec2:AuthorizeSecurityGroupIngress",
- "ec2:AssociateRouteTable",
- "ec2:DeleteRouteTable",
- "ec2:DeleteSubnet",
- "ec2:DeleteTags",
- "ec2:DeleteSecurityGroup",
- "ec2:DeleteSnapshot",
- "ec2:DescribeRouteTables",
- "ec2:DescribeSpotInstanceRequests",
- "ec2:ModifyVpcEndpoint",
- "ec2:RunInstances",
- "ec2:StartInstances",
- "ec2:StopInstances",
- "ec2:TerminateInstances",
- "ec2:DescribeSubnets",
- "ec2:DescribeVpcs",
- "ec2:DescribeSecurityGroups",
- "ec2:DescribeInstances",
- "ec2:DescribeInstanceStatus",
- "ec2:ModifyInstanceAttribute",
- "ec2:RevokeSecurityGroupEgress",
- "ec2:RevokeSecurityGroupIngress",
- "ec2:AuthorizeSecurityGroupEgress",
- "ec2:AuthorizeSecurityGroupIngress"
- ],
- "Effect": "Allow",
- "Resource": "*"
- },
- {
- "Action": [
- "s3:CreateBucket",
- "s3:ListAllMyBuckets",
- "s3:GetBucketLocation",
- "s3:GetBucketTagging",
- "s3:PutBucketTagging",
- "s3:PutBucketPolicy",
- "s3:GetBucketPolicy",
- "s3:DeleteBucket",
- "s3:DeleteObject",
- "s3:GetObject",
- "s3:ListBucket",
- "s3:PutObject",
- "s3:PutEncryptionConfiguration"
- ],
- "Effect": "Allow",
- "Resource": "*"
- },
- {
- "Action": [
- "elasticmapreduce:AddTags",
- "elasticmapreduce:RemoveTags",
- "elasticmapreduce:DescribeCluster",
- "elasticmapreduce:ListClusters",
- "elasticmapreduce:RunJobFlow",
- "elasticmapreduce:ListInstances",
- "elasticmapreduce:TerminateJobFlows"
- ],
- "Effect": "Allow",
- "Resource": "*"
- },
- {
- "Action": [
- "pricing:GetProducts"
- ],
- "Effect": "Allow",
- "Resource": "*"
- }
- ]
-}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/project/main/files/nb-assume-policy.json b/infrastructure-provisioning/terraform/aws/project/main/files/nb-assume-policy.json
deleted file mode 100644
index 680b6f8..0000000
--- a/infrastructure-provisioning/terraform/aws/project/main/files/nb-assume-policy.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "Version": "2012-10-17",
- "Statement": [
- {
- "Action": "sts:AssumeRole",
- "Principal": {
- "Service": "ec2.amazonaws.com"
- },
- "Effect": "Allow",
- "Sid": ""
- }
- ]
-}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/project/main/files/nb-policy.json b/infrastructure-provisioning/terraform/aws/project/main/files/nb-policy.json
deleted file mode 100644
index b03af44..0000000
--- a/infrastructure-provisioning/terraform/aws/project/main/files/nb-policy.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- "Version": "2012-10-17",
- "Statement": [
- {
- "Effect": "Allow",
- "Action": "s3:ListAllMyBuckets",
- "Resource": "arn:aws:s3:::*"
- },
- {
- "Effect": "Allow",
- "Action": [
- "s3:ListBucket",
- "s3:GetBucketLocation",
- "s3:PutBucketPolicy",
- "s3:PutEncryptionConfiguration"
- ],
- "Resource": [
- "arn:aws:s3:::${sbn}*"
- ]
- },
- {
- "Effect": "Allow",
- "Action": [
- "s3:GetObject",
- "s3:HeadObject"
- ],
- "Resource": "arn:aws:s3:::${sbn}-ssn-bucket/*"
- },
- {
- "Effect": "Allow",
- "Action": [
- "s3:HeadObject",
- "s3:PutObject",
- "s3:GetObject",
- "s3:DeleteObject"
- ],
- "Resource": [
- "arn:aws:s3:::${sbn}-bucket/*",
- "arn:aws:s3:::${sbn}-shared-bucket/*"
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/project/main/main.tf b/infrastructure-provisioning/terraform/aws/project/main/main.tf
deleted file mode 100644
index 6f5ac81..0000000
--- a/infrastructure-provisioning/terraform/aws/project/main/main.tf
+++ /dev/null
@@ -1,27 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-provider "aws" {
- access_key = var.access_key_id
- secret_key = var.secret_access_key
- region = var.region
-}
-
diff --git a/infrastructure-provisioning/terraform/aws/project/main/variales.tf b/infrastructure-provisioning/terraform/aws/project/main/variales.tf
deleted file mode 100644
index dfa7dc3..0000000
--- a/infrastructure-provisioning/terraform/aws/project/main/variales.tf
+++ /dev/null
@@ -1,64 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-variable "access_key_id" {}
-
-variable "secret_access_key" {}
-
-variable "service_base_name" {}
-
-variable "project_name" {}
-
-variable "project_tag" {}
-
-variable "endpoint_tag" {}
-
-variable "user_tag" {}
-
-variable "custom_tag" {}
-
-variable "region" {}
-
-variable "zone" {}
-
-variable "vpc_id" {}
-
-variable "subnet_id" {}
-
-variable "nb_cidr" {}
-
-variable "edge_cidr" {}
-
-variable "ami" {}
-
-variable "instance_type" {}
-
-variable "key_name" {}
-
-variable "edge_volume_size" {}
-
-variable "additional_tag" {
- default = "product:dlab"
-}
-
-variable "tag_resource_id" {
- default = "user:tag"
-}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/.helmignore b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/.helmignore
deleted file mode 100644
index 4976779..0000000
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/.helmignore
+++ /dev/null
@@ -1,43 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/Chart.yaml b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/Chart.yaml
deleted file mode 100644
index f6b3a45..0000000
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/Chart.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
-name: dlab-billing
-version: 0.1.0
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/NOTES.txt b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/NOTES.txt
deleted file mode 100644
index da55760..0000000
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/NOTES.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
- {{- range .paths }}
- http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
- {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
- export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "dlab-billing.fullname" . }})
- export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
- echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
- NOTE: It may take a few minutes for the LoadBalancer IP to be available.
- You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "dlab-billing.fullname" . }}'
- export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "dlab-billing.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
- echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
- export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "dlab-billing.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
- echo "Visit http://127.0.0.1:8080 to use your application"
- kubectl port-forward $POD_NAME 8080:80
-{{- end }}
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/_helpers.tpl b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/_helpers.tpl
deleted file mode 100644
index 777c89b..0000000
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/_helpers.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "dlab-billing.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "dlab-billing.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "dlab-billing.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "dlab-billing.labels" -}}
-app.kubernetes.io/name: {{ include "dlab-billing.name" . }}
-helm.sh/chart: {{ include "dlab-billing.chart" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/configmap-billing-conf.yaml b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/configmap-billing-conf.yaml
deleted file mode 100644
index 1bdf52b..0000000
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/configmap-billing-conf.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
-{{- /*
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-*/ -}}
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "dlab-billing.fullname" . }}-billing-conf
-data:
- billing.yml: |
- # Specify the parameters enclosed in angle brackets.
- # Run the follows command to get help for details of configuration:
- # java -jar billing-1.0.jar --help conf
- # java -jar billing-1.0.jar --help {adapter | parser | filter | logappender} [name]
-
- billingEnabled: true
-
- host: {{ .Values.billing.mongo.host }}
- port: {{ .Values.billing.mongo.port }}
- username: {{ .Values.billing.mongo.username }}
- password: ${MONGO_DB_PASSWORD}
- database: {{ .Values.billing.mongo.db_name }}
-
- scheduler:
- # Schedule is comma separated values of time in format hh[:mm[:ss]]. hh - in the 24-hour clock, at 8:15PM is 20:15.
- schedule: 8:40, 8:50, 9:00, 9:10, 9:20, 9:30, 16:00, 16:30, 17:00, 17:30, 18:00, 15:45, 16:45, 17:45, 17:15, 18:15, 18:00, 21:00
-
- # Adapter for reading source data. Known types: file, s3file
- adapterIn:
- - type: s3file
- bucket: {{ .Values.billing.bucket }}
- path: {{ .Values.billing.path }}
- awsJobEnabled: {{ .Values.billing.aws_job_enabled }}
- accountId: {{ .Values.billing.account_id }}
- accessKeyId:
- secretAccessKey:
-
- # Adapter for writing converted data. Known types: console, file, s3file, mongodb
- adapterOut:
- - type: mongodlab
- host: {{ .Values.billing.mongo.host }}
- port: {{ .Values.billing.mongo.port }}
- username: {{ .Values.billing.mongo.username }}
- password: ${MONGO_DB_PASSWORD}
- database: {{ .Values.billing.mongo.db_name }}
- # bufferSize: 10000
- upsert: true
-
- # Filter for source and converted data.
- filter:
- - type: aws
- currencyCode: USD
- columnDlabTag: {{ .Values.billing.tag }}
- serviceBaseName: {{ .Values.billing.service_base_name }}
-
-
- # Parser of source data to common format.
- parser:
- - type: csv
- headerLineNo: 1
- skipLines: 1
- columnMapping: >-
- dlab_id={{ .Values.billing.dlab_id }};usage_date={{ .Values.billing.usage_date }};product={{ .Values.billing.product }};
- usage_type={{ .Values.billing.usage_type }};usage={{ .Values.billing.usage }};cost={{ .Values.billing.cost }};
- resource_id={{ .Values.billing.resource_id }};tags={{ .Values.billing.tags }}
- aggregate: day
-
-
- # Logging configuration.
- logging:
- # Default logging level
- level: INFO
- # Logging levels for appenders.
- loggers:
- com.epam: DEBUG
- org.apache.http: WARN
- org.mongodb.driver: WARN
- org.hibernate: WARN
- # Logging appenders
- appenders:
- - type: console
- - type: file
- currentLogFilename: /root/billing.log
- archive: true
- archivedLogFilenamePattern: /root/billing-%d{yyyy-MM-dd}.log.gz
- archivedFileCount: 10
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/deployment.yaml b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/deployment.yaml
deleted file mode 100644
index 975cd65..0000000
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/deployment.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-{{- /*
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-*/ -}}
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ include "dlab-billing.fullname" . }}
- labels:
-{{ include "dlab-billing.labels" . | indent 4 }}
-spec:
- replicas: {{ .Values.replicaCount }}
- selector:
- matchLabels:
- app.kubernetes.io/name: {{ include "dlab-billing.name" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- template:
- metadata:
- labels:
- app.kubernetes.io/name: {{ include "dlab-billing.name" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- spec:
- {{- with .Values.imagePullSecrets }}
- imagePullSecrets:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- containers:
- - name: {{ .Chart.Name }}
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
- imagePullPolicy: {{ .Values.image.pullPolicy }}
- env:
- - name: MONGO_DB_PASSWORD
- valueFrom:
- secretKeyRef:
- name: mongo-db-password
- key: password
- ports:
- - name: mongo
- containerPort: 21017
- protocol: TCP
- resources:
- {{- toYaml .Values.resources | nindent 12 }}
- volumeMounts:
- - name: billing-yml
- mountPath: /root/billing.yml
- subPath: billing
- readOnly: true
- volumes:
- - name: billing-yml
- configMap:
- name: {{ include "dlab-billing.fullname" . }}-billing-conf
- defaultMode: 0644
- items:
- - key: billing.yml
- path: billing
- {{- with .Values.nodeSelector }}
- nodeSelector:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- {{- with .Values.affinity }}
- affinity:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- {{- with .Values.tolerations }}
- tolerations:
- {{- toYaml . | nindent 8 }}
- {{- end }}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/service.yaml b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/service.yaml
deleted file mode 100644
index 50cc066..0000000
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/service.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-{{- /*
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-*/ -}}
-
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ include "dlab-billing.fullname" . }}
- labels:
-{{ include "dlab-billing.labels" . | indent 4 }}
-spec:
- ports:
- - port: {{ .Values.service.port }}
- targetPort: 27017
- protocol: TCP
- selector:
- app.kubernetes.io/name: {{ include "dlab-billing.name" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
-
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/values.yaml b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/values.yaml
deleted file mode 100644
index 6b731e7..0000000
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/values.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-# Default values for dlab-billing.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
- repository: epamdlab/billing
- tag: '0.1-aws'
- # pullPolicy: IfNotPresent
- pullPolicy: Always
-
-#imagePullSecrets: []
-#nameOverride: ""
-#fullnameOverride: ""
-
-service:
- type: ClusterIP
- port: 58334
-
-ingress:
- enabled: false
- host: ""
- annotations:
- # kubernetes.io/ingress.class: nginx
- # nginx.ingress.kubernetes.io/ssl-redirect: "false"
- # kubernetes.io/tls-acme: "true"
-
- tls: []
- # - secretName: chart-example-tls
- # hosts:
- # - chart-example.local
-labels: {}
-
-billing:
- mongo:
- host: ${mongo_service_name}
- port: ${mongo_port}
- username: ${mongo_user}
- db_name: ${mongo_db_name}
- service_base_name: ${service_base_name}
- tag_resource_id: ${tag_resource_id}
- bucket: ${billing_bucket}
- path: ${billing_bucket_path}
- aws_job_enabled: ${billing_aws_job_enabled}
- account_id: ${billing_aws_account_id}
- tag: ${billing_tag}
- dlab_id: ${billing_dlab_id}
- usage_date: ${billing_usage_date}
- product: ${billing_product}
- usage_type: ${billing_usage_type}
- usage: ${billing_usage}
- cost: ${billing_cost}
- resource_id: ${billing_resource_id}
- tags: ${billing_tags}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/.helmignore b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/.helmignore
deleted file mode 100644
index 4976779..0000000
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/.helmignore
+++ /dev/null
@@ -1,43 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/Chart.yaml b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/Chart.yaml
deleted file mode 100644
index 3e7800b..0000000
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/Chart.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
-name: dlab-ui
-version: 0.1.0
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/NOTES.txt b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/NOTES.txt
deleted file mode 100644
index 9481026..0000000
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/NOTES.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-1. Get the application URL by running these commands:
-{{- if .Values.ui.ingress.enabled }}
-{{- range $host := .Values.ui.ingress.hosts }}
- {{- range .paths }}
- http{{ if $.Values.ui.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
- {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.ui.service.type }}
- export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "dlab-ui.fullname" . }})
- export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
- echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.ui.service.type }}
- NOTE: It may take a few minutes for the LoadBalancer IP to be available.
- You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "dlab-ui.fullname" . }}'
- export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "dlab-ui.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
- echo http://$SERVICE_IP:{{ .Values.ui.service.http_port }}
-{{- else if contains "ClusterIP" .Values.ui.service.type }}
- export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "dlab-ui.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
- echo "Visit http://127.0.0.1:8080 to use your application"
- kubectl port-forward $POD_NAME 8080:80
-{{- end }}
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/_helpers.tpl b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/_helpers.tpl
deleted file mode 100644
index ca4bcd5..0000000
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/_helpers.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "dlab-ui.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "dlab-ui.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "dlab-ui.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "dlab-ui.labels" -}}
-app.kubernetes.io/name: {{ include "dlab-ui.name" . }}
-helm.sh/chart: {{ include "dlab-ui.chart" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/ingress.yaml b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/ingress.yaml
deleted file mode 100644
index d53fb5e..0000000
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/ingress.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-{{- /*
-# ******************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-*/ -}}
-
-{{- if .Values.ui.ingress.enabled -}}
-{{- $fullName := include "dlab-ui.fullname" . -}}
-{{ $servicePort := .Values.ui.service.http_port }}
-{{ $host := .Values.ui.ingress.host }}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
- name: {{ $fullName }}
- labels:
-{{ include "dlab-ui.labels" . | indent 4 }}
- annotations:
-{{- with .Values.ui.ingress.annotations }}
-{{ toYaml . | indent 4 }}
- {{- end }}
-spec:
-{{- if .Values.ui.ingress.tls }}
- tls:
- {{- range .Values.ui.ingress.tls }}
- - hosts:
- {{- range .hosts }}
- - {{ . | quote }}
- {{- end }}
- secretName: {{ .secretName }}
- {{- end }}
-{{- end }}
- rules:
- - host: {{ $host }}
- http:
- paths:
- - backend:
- serviceName: {{ $fullName }}
- servicePort: {{ $servicePort }}
- path: /
-{{- end }}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/README.md b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/README.md
deleted file mode 100644
index d91e5e0..0000000
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Terraform module for deploying DLab SSN K8S cluster
-
-List of variables which should be provided:
-
-| Variable | Type | Description/Value |
-|--------------------------|--------|-----------------------------------------------------------------------------------------------------------|
-| access\_key\_id | string | **Required.** AWS Access Key ID. |
-| secret\_access\_key | string | **Required.** AWS Secret Access Key. |
-| service\_base\_name | string | Any infrastructure value (should be unique if multiple SSN’s have been deployed before). Default: dlab-k8s|
-| vpc\_id | string | ID of AWS VPC if you already have VPC created. |
-| vpc\_cidr | string | CIDR for VPC creation. Conflicts with _vpc\_id_. Default: 172.31.0.0/16 |
-| subnet\_id | string | ID of AWS Subnet if you already have subnet created. |
-| subnet\_cidr | string | CIDR for Subnet creation. Conflicts with _subnet\_id_. Default: 172.31.0.0/24 |
-| env\_os | string | OS type. Available options: debian, redhat. Default: debian |
-| ami | string | **Required.** ID of EC2 AMI. |
-| key\_name | string | **Required.** Name of EC2 Key pair. |
-| region | string | Name of AWS region. Default: us-west-2 |
-| zone | string | Name of AWS zone. Default: a |
-| ssn\_k8s\_masters\_count | int | Count of K8S masters. Default: 3 |
-| ssn\_k8s\_workers\_count | int | Count of K8S workers. Default: 2 |
-| ssn\_root\_volume\_size | int | Size of root volume in GB. Default: 30 |
-| allowed\_cidrs | list | CIDR to allow acces to SSN K8S cluster. Default: 0.0.0.0/0 |
-| ssn\_k8s\_masters\_shape | string | Shape for SSN K8S masters. Default: t2.medium |
-| ssn\_k8s\_workers\_shape | string | Shape for SSN K8S workers. Default: t2.medium |
-| os\_user | string | Name of DLab service user. Default: dlab-user |
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/assume-policy.json b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/assume-policy.json
deleted file mode 100644
index 680b6f8..0000000
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/assume-policy.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "Version": "2012-10-17",
- "Statement": [
- {
- "Action": "sts:AssumeRole",
- "Principal": {
- "Service": "ec2.amazonaws.com"
- },
- "Effect": "Allow",
- "Sid": ""
- }
- ]
-}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/azure/computational_resources/main/main.tf b/infrastructure-provisioning/terraform/azure/computational_resources/main/main.tf
deleted file mode 100644
index 9ded494..0000000
--- a/infrastructure-provisioning/terraform/azure/computational_resources/main/main.tf
+++ /dev/null
@@ -1,72 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-provider "azurerm" {
- subscription_id = var.subscription_id
- client_id = var.client_id
- client_secret = var.client_secret
- tenant_id = var.tenant_id
-}
-
-module "notebook" {
- source = "../modules/notebook"
- sbn = var.service_base_name
- project_name = var.project_name
- project_tag = var.project_tag
- endpoint_tag = var.endpoint_tag
- user_tag = var.user_tag
- custom_tag = var.custom_tag
- os_env = var.os_env
- notebook_name = var.notebook_name
- region = var.region
- subnet_id = var.subnet_id
- nb-sg_id = var.nb-sg_id
- product = var.product_name
- ami = var.ami
- custom_ami = var.custom_ami
- instance_type = var.instance_type
- ssh_key = var.ssh_key
- initial_user = var.initial_user
- resource_group = var.resource_group
-}
-
-module "data_engine" {
- source = "../modules/data_engine"
- sbn = var.service_base_name
- project_name = var.project_name
- project_tag = var.project_tag
- endpoint_tag = var.endpoint_tag
- user_tag = var.user_tag
- custom_tag = var.custom_tag
- notebook_name = var.notebook_name
- region = var.region
- subnet_id = var.subnet_id
- nb-sg_id = var.nb-sg_id
- product = var.product_name
- ami = var.ami
- master_shape = var.master_shape
- slave_shape = var.slave_shape
- ssh_key = var.ssh_key
- initial_user = var.initial_user
- cluster_name = var.cluster_name
- slave_count = var.slave_count
- resource_group = var.resource_group
-}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/azure/computational_resources/main/variables.tf b/infrastructure-provisioning/terraform/azure/computational_resources/main/variables.tf
deleted file mode 100644
index f82d9f7..0000000
--- a/infrastructure-provisioning/terraform/azure/computational_resources/main/variables.tf
+++ /dev/null
@@ -1,80 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-variable "subscription_id" {}
-
-variable "client_id" {}
-
-variable "client_secret" {}
-
-variable "tenant_id" {}
-
-variable "service_base_name" {}
-
-variable "resource_group" {}
-
-variable "project_name" {}
-
-variable "project_tag" {}
-
-variable "endpoint_tag" {}
-
-variable "user_tag" {}
-
-variable "custom_tag" {}
-
-variable "os_env" {}
-
-variable "notebook_name" {}
-
-variable "region" {}
-
-variable "product_name" {}
-
-variable "vpc_id" {}
-
-variable "subnet_id" {}
-
-variable "nb-sg_id" {}
-
-variable "cidr_range" {}
-
-variable "traefik_cidr" {}
-
-variable "ami" {}
-
-variable "custom_ami" {}
-
-variable "instance_type" {}
-
-variable "ssh_key" {}
-
-variable "initial_user" {}
-
-variable "cluster_name" {}
-
-variable "slave_count" {}
-
-variable "master_shape" {}
-
-variable "slave_shape" {}
-
-variable "source_instance_id" {}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/azure/computational_resources/modules/data_engine/variables.tf b/infrastructure-provisioning/terraform/azure/computational_resources/modules/data_engine/variables.tf
deleted file mode 100644
index e18e812..0000000
--- a/infrastructure-provisioning/terraform/azure/computational_resources/modules/data_engine/variables.tf
+++ /dev/null
@@ -1,58 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-variable "project_name" {}
-
-variable "sbn" {}
-
-variable "project_tag" {}
-
-variable "endpoint_tag" {}
-
-variable "user_tag" {}
-
-variable "custom_tag" {}
-
-variable "notebook_name" {}
-
-variable "region" {}
-
-variable "product" {}
-
-variable "ami" {}
-
-variable "master_shape" {}
-
-variable "slave_shape" {}
-
-variable "ssh_key" {}
-
-variable "initial_user" {}
-
-variable "subnet_id" {}
-
-variable "nb-sg_id" {}
-
-variable "cluster_name" {}
-
-variable "slave_count" {}
-
-variable "resource_group" {}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/azure/computational_resources/modules/notebook/variables.tf b/infrastructure-provisioning/terraform/azure/computational_resources/modules/notebook/variables.tf
deleted file mode 100644
index 547dce0..0000000
--- a/infrastructure-provisioning/terraform/azure/computational_resources/modules/notebook/variables.tf
+++ /dev/null
@@ -1,92 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-variable "project_name" {}
-
-variable "sbn" {}
-
-variable "project_tag" {}
-
-variable "endpoint_tag" {}
-
-variable "user_tag" {}
-
-variable "custom_tag" {}
-
-variable "notebook_name" {}
-
-variable "region" {}
-
-variable "product" {}
-
-variable "ami" {}
-
-variable "instance_type" {}
-
-variable "ssh_key" {}
-
-variable "initial_user" {}
-
-variable "subnet_id" {}
-
-variable "nb-sg_id" {}
-
-variable "resource_group" {}
-
-variable "ami_publisher" {
- type = "map"
- default = {
- debian = "Canonical"
- redhat = "RedHat"
- custom = ""
- }
-}
-
-variable "ami_offer" {
- type = "map"
- default = {
- debian = "UbuntuServer"
- redhat = "RHEL"
- custom = ""
- }
-}
-
-variable "ami_sku" {
- type = "map"
- default = {
- debian = "16.04-LTS"
- redhat = "7.3"
- custom = ""
- }
-}
-
-variable "ami_version" {
- type = "map"
- default = {
- debian = "16.04.201907290"
- redhat = "7.3.2017090800"
- custom = ""
- }
-}
-
-variable "custom_ami" {}
-
-variable "os_env" {}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/azure/project/main/main.tf b/infrastructure-provisioning/terraform/azure/project/main/main.tf
deleted file mode 100644
index 249c945..0000000
--- a/infrastructure-provisioning/terraform/azure/project/main/main.tf
+++ /dev/null
@@ -1,27 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-provider "azurerm" {
- subscription_id = var.subscription_id
- client_id = var.client_id
- client_secret = var.client_secret
- tenant_id = var.tenant_id
-}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/azure/project/main/network.tf b/infrastructure-provisioning/terraform/azure/project/main/network.tf
deleted file mode 100644
index e1a93b1..0000000
--- a/infrastructure-provisioning/terraform/azure/project/main/network.tf
+++ /dev/null
@@ -1,442 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-locals {
- edge_sg_name = "${var.service_base_name}-${var.project_tag}-edge-sg"
- edge_ip_name = "${var.service_base_name}-${var.project_tag}-edge-ip"
- ps_subnet_name = "${var.service_base_name}-${var.project_tag}-ps-subnet"
- ps_sg_name = "${var.service_base_name}-${var.project_tag}-ps-sg"
-}
-
-#################
-### Edge node ###
-#################
-
-resource "azurerm_public_ip" "edge_ip" {
- location = var.region
- name = local.edge_ip_name
- resource_group_name = var.resource_group
- allocation_method = "Static"
- tags = {
- SBN = var.service_base_name
- Name = local.edge_ip_name
- Project_tag = var.project_tag
- Endpoint_Tag = var.endpoint_tag
- Product = var.product
- User_Tag = var.user_tag
- Custom_Tag = var.custom_tag
- }
-}
-
-resource "azurerm_network_security_group" "edge_sg" {
- name = local.edge_sg_name
- location = var.region
- resource_group_name = var.resource_group
-
- security_rule {
- name = "in-1"
- priority = 100
- direction = "Inbound"
- access = "Allow"
- protocol = "*"
- source_port_range = "*"
- destination_port_range = "*"
- source_address_prefix = "${var.ps_cidr}"
- destination_address_prefix = "*"
- }
-
- security_rule {
- name = "in-2"
- priority = 110
- direction = "Inbound"
- access = "Allow"
- protocol = "TCP"
- source_port_range = "*"
- destination_port_range = "22"
- source_address_prefix = "*"
- destination_address_prefix = "*"
- }
-
- security_rule {
- name = "in-3"
- priority = 120
- direction = "Inbound"
- access = "Allow"
- protocol = "TCP"
- source_port_range = "*"
- destination_port_range = "3128"
- source_address_prefix = "*"
- destination_address_prefix = "*"
- }
-
- security_rule {
- name = "in-4"
- priority = 130
- direction = "Inbound"
- access = "Allow"
- protocol = "TCP"
- source_port_range = "*"
- destination_port_range = "80"
- source_address_prefix = "*"
- destination_address_prefix = "*"
- }
-
- security_rule {
- name = "out-1"
- priority = 100
- direction = "Outbound"
- access = "Allow"
- protocol = "TCP"
- source_port_range = "*"
- destination_port_range = "22"
- source_address_prefix = "*"
- destination_address_prefix = "${var.ps_cidr}"
- }
-
- security_rule {
- name = "out-2"
- priority = 110
- direction = "Outbound"
- access = "Allow"
- protocol = "TCP"
- source_port_range = "*"
- destination_port_range = "8888"
- source_address_prefix = "*"
- destination_address_prefix = "${var.ps_cidr}"
- }
-
- security_rule {
- name = "out-3"
- priority = 120
- direction = "Outbound"
- access = "Allow"
- protocol = "TCP"
- source_port_range = "*"
- destination_port_range = "8080"
- source_address_prefix = "*"
- destination_address_prefix = "${var.ps_cidr}"
- }
-
- security_rule {
- name = "out-4"
- priority = 130
- direction = "Outbound"
- access = "Allow"
- protocol = "TCP"
- source_port_range = "*"
- destination_port_range = "8787"
- source_address_prefix = "*"
- destination_address_prefix = "${var.ps_cidr}"
- }
-
- security_rule {
- name = "out-5"
- priority = 140
- direction = "Outbound"
- access = "Allow"
- protocol = "TCP"
- source_port_range = "*"
- destination_port_range = "6006"
- source_address_prefix = "*"
- destination_address_prefix = "${var.ps_cidr}"
- }
-
- security_rule {
- name = "out-6"
- priority = 150
- direction = "Outbound"
- access = "Allow"
- protocol = "TCP"
- source_port_range = "*"
- destination_port_range = "20888"
- source_address_prefix = "*"
- destination_address_prefix = "${var.ps_cidr}"
- }
-
- security_rule {
- name = "out-7"
- priority = 160
- direction = "Outbound"
- access = "Allow"
- protocol = "TCP"
- source_port_range = "*"
- destination_port_range = "8088"
- source_address_prefix = "*"
- destination_address_prefix = "${var.ps_cidr}"
- }
-
- security_rule {
- name = "out-8"
- priority = 170
- direction = "Outbound"
- access = "Allow"
- protocol = "TCP"
- source_port_range = "*"
- destination_port_range = "18080"
- source_address_prefix = "*"
- destination_address_prefix = "${var.ps_cidr}"
- }
-
- security_rule {
- name = "out-9"
- priority = 180
- direction = "Outbound"
- access = "Allow"
- protocol = "TCP"
- source_port_range = "*"
- destination_port_range = "50070"
- source_address_prefix = "*"
- destination_address_prefix = "${var.ps_cidr}"
- }
-
- security_rule {
- name = "out-10"
- priority = 190
- direction = "Outbound"
- access = "Allow"
- protocol = "TCP"
- source_port_range = "*"
- destination_port_range = "8085"
- source_address_prefix = "*"
- destination_address_prefix = "${var.ps_cidr}"
- }
-
- security_rule {
- name = "out-11"
- priority = 200
- direction = "Outbound"
- access = "Allow"
- protocol = "TCP"
- source_port_range = "*"
- destination_port_range = "8081"
- source_address_prefix = "*"
- destination_address_prefix = "${var.ps_cidr}"
- }
-
- security_rule {
- name = "out-12"
- priority = 210
- direction = "Outbound"
- access = "Allow"
- protocol = "TCP"
- source_port_range = "*"
- destination_port_range = "4040-4140"
- source_address_prefix = "*"
- destination_address_prefix = "*"
- }
-
- security_rule {
- name = "out-13"
- priority = 220
- direction = "Outbound"
- access = "Allow"
- protocol = "UDP"
- source_port_range = "*"
- destination_port_range = "53"
- source_address_prefix = "*"
- destination_address_prefix = "*"
- }
-
- security_rule {
- name = "out-14"
- priority = 230
- direction = "Outbound"
- access = "Allow"
- protocol = "TCP"
- source_port_range = "*"
- destination_port_range = "80"
- source_address_prefix = "*"
- destination_address_prefix = "*"
- }
-
- security_rule {
- name = "out-15"
- priority = 240
- direction = "Outbound"
- access = "Allow"
- protocol = "TCP"
- source_port_range = "*"
- destination_port_range = "443"
- source_address_prefix = "*"
- destination_address_prefix = "*"
- }
-
- security_rule {
- name = "out-16"
- priority = 250
- direction = "Outbound"
- access = "Allow"
- protocol = "TCP"
- source_port_range = "*"
- destination_port_range = "389"
- source_address_prefix = "*"
- destination_address_prefix = "*"
- }
-
- security_rule {
- name = "out-17"
- priority = 260
- direction = "Outbound"
- access = "Allow"
- protocol = "*"
- source_port_range = "*"
- destination_port_range = "8042"
- source_address_prefix = "*"
- destination_address_prefix = "${var.ps_cidr}"
- }
-
- security_rule {
- name = "out-18"
- priority = 270
- direction = "Outbound"
- access = "Allow"
- protocol = "UDP"
- source_port_range = "*"
- destination_port_range = "123"
- source_address_prefix = "*"
- destination_address_prefix = "*"
- }
-
- security_rule {
- name = "out-19"
- priority = 280
- direction = "Outbound"
- access = "Deny"
- protocol = "*"
- source_port_range = "*"
- destination_port_range = "*"
- source_address_prefix = "*"
- destination_address_prefix = "*"
- }
-}
-
-############################################################
-### Explotratory environment and computational resources ###
-############################################################
-
-
-resource "azurerm_subnet" "ps_subnet" {
- name = local.ps_subnet_name
- resource_group_name = var.resource_group
- virtual_network_name = var.vpc_id
- address_prefix = var.ps_cidr
-}
-
-resource "azurerm_network_security_group" "ps_sg" {
- name = local.ps_sg_name
- location = var.region
- resource_group_name = var.resource_group
-
- security_rule {
- name = "in-1"
- priority = 100
- direction = "Inbound"
- access = "Allow"
- protocol = "*"
- source_port_range = "*"
- destination_port_range = "*"
- source_address_prefix = "${var.ps_cidr}"
- destination_address_prefix = "*"
- }
-
- security_rule {
- name = "in-2"
- priority = 110
- direction = "Inbound"
- access = "Allow"
- protocol = "*"
- source_port_range = "*"
- destination_port_range = "*"
- source_address_prefix = "${var.edge_cidr}"
- destination_address_prefix = "*"
- }
-
- security_rule {
- name = "in-3"
- priority = 200
- direction = "Inbound"
- access = "Deny"
- protocol = "*"
- source_port_range = "*"
- destination_port_range = "*"
- source_address_prefix = "*"
- destination_address_prefix = "*"
- }
-
- security_rule {
- name = "out-1"
- priority = 100
- direction = "Outbound"
- access = "Allow"
- protocol = "*"
- source_port_range = "*"
- destination_port_range = "*"
- source_address_prefix = "*"
- destination_address_prefix = "${var.ps_cidr}"
- }
-
- security_rule {
- name = "out-2"
- priority = 110
- direction = "Outbound"
- access = "Allow"
- protocol = "*"
- source_port_range = "*"
- destination_port_range = "*"
- source_address_prefix = "*"
- destination_address_prefix = "${var.edge_cidr}"
- }
-
- security_rule {
- name = "out-3"
- priority = 120
- direction = "Outbound"
- access = "Allow"
- protocol = "*"
- source_port_range = "443"
- destination_port_range = "*"
- source_address_prefix = "*"
- destination_address_prefix = "*"
- }
-
- security_rule {
- name = "out-4"
- priority = 200
- direction = "Outbound"
- access = "Deny"
- protocol = "*"
- source_port_range = "*"
- destination_port_range = "*"
- source_address_prefix = "*"
- destination_address_prefix = "*"
- }
-
- tags = {
- Name = local.ps_subnet_name
- SBN = var.service_base_name
- Product = var.product
- Project_name = var.project_name
- Project_tag = var.project_tag
- Endpoint_tag = var.endpoint_tag
- User_tag = var.user_tag
- Custom_tag = var.custom_tag
- }
-}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/azure/project/main/variables.tf b/infrastructure-provisioning/terraform/azure/project/main/variables.tf
deleted file mode 100644
index e3395fd..0000000
--- a/infrastructure-provisioning/terraform/azure/project/main/variables.tf
+++ /dev/null
@@ -1,100 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-variable "subscription_id" {}
-
-variable "client_id" {}
-
-variable "client_secret" {}
-
-variable "tenant_id" {}
-
-variable "service_base_name" {}
-
-variable "resource_group" {}
-
-variable "project_name" {}
-
-variable "project_tag" {}
-
-variable "endpoint_tag" {}
-
-variable "user_tag" {}
-
-variable "custom_tag" {}
-
-variable "os_env" {}
-
-variable "region" {}
-
-variable "product" {}
-
-variable "vpc_id" {}
-
-variable "subnet_id" {}
-
-variable "ps_cidr" {}
-
-variable "edge_cidr" {}
-
-variable "edge_private_ip" {}
-
-variable "instance_type" {}
-
-variable "ssh_key" {}
-
-variable "initial_user" {}
-
-variable "ami_publisher" {
- type = "map"
- default = {
- debian = "Canonical"
- redhat = "RedHat"
- custom = ""
- }
-}
-
-variable "ami_offer" {
- type = "map"
- default = {
- debian = "UbuntuServer"
- redhat = "RHEL"
- custom = ""
- }
-}
-
-variable "ami_sku" {
- type = "map"
- default = {
- debian = "16.04-LTS"
- redhat = "7.3"
- custom = ""
- }
-}
-
-variable "ami_version" {
- type = "map"
- default = {
- debian = "16.04.201907290"
- redhat = "7.3.2017090800"
- custom = ""
- }
-}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/bin/deploy/daemon.json b/infrastructure-provisioning/terraform/bin/deploy/daemon.json
deleted file mode 100644
index b99eac2..0000000
--- a/infrastructure-provisioning/terraform/bin/deploy/daemon.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- DNS_IP_RESOLVE
- "insecure-registries": ["REPOSITORY"],
- "disable-legacy-registry": true
-}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/bin/requirements.txt b/infrastructure-provisioning/terraform/bin/requirements.txt
deleted file mode 100644
index 5035545..0000000
--- a/infrastructure-provisioning/terraform/bin/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-fabric==2.4.0
-patchwork==1.0.1
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/gcp/endpoint/daemon.json b/infrastructure-provisioning/terraform/gcp/endpoint/daemon.json
deleted file mode 100644
index 7dc7f46..0000000
--- a/infrastructure-provisioning/terraform/gcp/endpoint/daemon.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- DNS_IP_RESOLVE
- "insecure-registries": ["REPOSITORY"],
- "disable-legacy-registry": true
-}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/gcp/endpoint/supervisor_svc.conf b/infrastructure-provisioning/terraform/gcp/endpoint/supervisor_svc.conf
deleted file mode 100644
index 7bb19b2..0000000
--- a/infrastructure-provisioning/terraform/gcp/endpoint/supervisor_svc.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-; *****************************************************************************
-;
-; Licensed to the Apache Software Foundation (ASF) under one
-; or more contributor license agreements. See the NOTICE file
-; distributed with this work for additional information
-; regarding copyright ownership. The ASF licenses this file
-; to you under the Apache License, Version 2.0 (the
-; "License"); you may not use this file except in compliance
-; with the License. You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing,
-; software distributed under the License is distributed on an
-; "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-; KIND, either express or implied. See the License for the
-; specific language governing permissions and limitations
-; under the License.
-;
-; ******************************************************************************
-
-[supervisorctl]
-
-[inet_http_server]
-port = 127.0.0.1:9001
-
-[program:provserv]
-command=java -Xmx1024M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8 WEB_APP_DIR/provisioning-service.jar server WEB_CONFprovisioning.yml
-directory=WEB_APP_DIR
-autorestart=true
-priority=20
-user=OS_USR
-stdout_logfile=/var/log/application/provision-service.log
-redirect_stderr=true
-environment=DLAB_CONF_DIR="WEB_CONF"
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/outputs.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/outputs.tf
deleted file mode 100644
index 340847c..0000000
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/outputs.tf
+++ /dev/null
@@ -1,40 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-output "ssn_keystore_password" {
- value = random_string.ssn_keystore_password.result
-}
-
-output "endpoint_keystore_password" {
- value = random_string.endpoint_keystore_password.result
-}
-
-output "gke_cluster_name" {
- value = google_container_cluster.ssn_k8s_gke_cluster.name
-}
-
-output "vpc_name" {
- value = data.google_compute_network.ssn_gke_vpc_data.name
-}
-
-output "subnet_name" {
- value = data.google_compute_subnetwork.ssn_gke_subnet_data.name
-}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/variables.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/variables.tf
deleted file mode 100644
index d5e566a..0000000
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/variables.tf
+++ /dev/null
@@ -1,43 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-variable "additional_tag" {}
-
-variable "service_base_name" {}
-
-variable "region" {}
-
-variable "gke_cluster_version" {}
-
-variable "ssn_k8s_workers_count" {}
-
-variable "ssn_k8s_workers_shape" {}
-
-variable "project_id" {}
-
-variable "service_account_iam_roles" {}
-
-variable "vpc_name" {}
-
-variable "subnet_name" {}
-
-variable "subnet_cidr" {}
-
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/.helmignore b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/.helmignore
deleted file mode 100644
index 4976779..0000000
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/.helmignore
+++ /dev/null
@@ -1,43 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/Chart.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/Chart.yaml
deleted file mode 100644
index f6b3a45..0000000
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/Chart.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
-name: dlab-billing
-version: 0.1.0
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/templates/NOTES.txt b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/templates/NOTES.txt
deleted file mode 100644
index da55760..0000000
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/templates/NOTES.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
- {{- range .paths }}
- http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
- {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
- export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "dlab-billing.fullname" . }})
- export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
- echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
- NOTE: It may take a few minutes for the LoadBalancer IP to be available.
- You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "dlab-billing.fullname" . }}'
- export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "dlab-billing.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
- echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
- export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "dlab-billing.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
- echo "Visit http://127.0.0.1:8080 to use your application"
- kubectl port-forward $POD_NAME 8080:80
-{{- end }}
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/templates/_helpers.tpl b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/templates/_helpers.tpl
deleted file mode 100644
index 777c89b..0000000
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/templates/_helpers.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "dlab-billing.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "dlab-billing.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "dlab-billing.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "dlab-billing.labels" -}}
-app.kubernetes.io/name: {{ include "dlab-billing.name" . }}
-helm.sh/chart: {{ include "dlab-billing.chart" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/templates/configmap-billing-conf.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/templates/configmap-billing-conf.yaml
deleted file mode 100644
index a677b93..0000000
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/templates/configmap-billing-conf.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-{{- /*
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-*/ -}}
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "dlab-billing.fullname" . }}-billing-conf
-data:
- billing.yml: |
- server:
- port: 8088
- spring:
- data:
- mongodb:
- username: {{ .Values.billing.mongo.username }}
- password: ${MONGO_DB_PASSWORD}
- database: {{ .Values.billing.mongo.db_name }}
- port: {{ .Values.billing.mongo.port }}
- host: {{ .Values.billing.mongo.host }}
- dlab:
- sbn: {{ .Values.billing.service_base_name }}
- bigQueryDataset: {{ .Values.billing.big_query_dataset }}
- cron: 0 * * * * *
-
- logging:
- file: /root/billing.log
- level:
- com:
- epam: trace
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/templates/deployment.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/templates/deployment.yaml
deleted file mode 100644
index 975cd65..0000000
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/templates/deployment.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-{{- /*
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-*/ -}}
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ include "dlab-billing.fullname" . }}
- labels:
-{{ include "dlab-billing.labels" . | indent 4 }}
-spec:
- replicas: {{ .Values.replicaCount }}
- selector:
- matchLabels:
- app.kubernetes.io/name: {{ include "dlab-billing.name" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- template:
- metadata:
- labels:
- app.kubernetes.io/name: {{ include "dlab-billing.name" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- spec:
- {{- with .Values.imagePullSecrets }}
- imagePullSecrets:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- containers:
- - name: {{ .Chart.Name }}
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
- imagePullPolicy: {{ .Values.image.pullPolicy }}
- env:
- - name: MONGO_DB_PASSWORD
- valueFrom:
- secretKeyRef:
- name: mongo-db-password
- key: password
- ports:
- - name: mongo
- containerPort: 21017
- protocol: TCP
- resources:
- {{- toYaml .Values.resources | nindent 12 }}
- volumeMounts:
- - name: billing-yml
- mountPath: /root/billing.yml
- subPath: billing
- readOnly: true
- volumes:
- - name: billing-yml
- configMap:
- name: {{ include "dlab-billing.fullname" . }}-billing-conf
- defaultMode: 0644
- items:
- - key: billing.yml
- path: billing
- {{- with .Values.nodeSelector }}
- nodeSelector:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- {{- with .Values.affinity }}
- affinity:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- {{- with .Values.tolerations }}
- tolerations:
- {{- toYaml . | nindent 8 }}
- {{- end }}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/templates/service.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/templates/service.yaml
deleted file mode 100644
index 50cc066..0000000
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/templates/service.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-{{- /*
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-*/ -}}
-
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ include "dlab-billing.fullname" . }}
- labels:
-{{ include "dlab-billing.labels" . | indent 4 }}
-spec:
- ports:
- - port: {{ .Values.service.port }}
- targetPort: 27017
- protocol: TCP
- selector:
- app.kubernetes.io/name: {{ include "dlab-billing.name" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
-
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/values.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/values.yaml
deleted file mode 100644
index 5d44e13..0000000
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-billing-chart/values.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-# Default values for dlab-billing.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
- repository: epamdlab/billing
- tag: '0.1-gcp'
- # pullPolicy: IfNotPresent
- pullPolicy: Always
-
-#imagePullSecrets: []
-#nameOverride: ""
-#fullnameOverride: ""
-
-service:
- type: ClusterIP
- port: 58334
-
-ingress:
- enabled: false
- host: ""
- annotations:
- # kubernetes.io/ingress.class: nginx
- # nginx.ingress.kubernetes.io/ssl-redirect: "false"
- # kubernetes.io/tls-acme: "true"
-
- tls: []
- # - secretName: chart-example-tls
- # hosts:
- # - chart-example.local
-labels: {}
-
-billing:
- mongo:
- host: ${mongo_service_name}
- port: ${mongo_port}
- username: ${mongo_user}
- db_name: ${mongo_db_name}
- service_base_name: ${service_base_name}
- big_query_dataset: ${big_query_dataset}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/.helmignore b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/.helmignore
deleted file mode 100644
index 4976779..0000000
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/.helmignore
+++ /dev/null
@@ -1,43 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/Chart.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/Chart.yaml
deleted file mode 100644
index 3e7800b..0000000
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/Chart.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
-name: dlab-ui
-version: 0.1.0
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/NOTES.txt b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/NOTES.txt
deleted file mode 100644
index 9481026..0000000
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/NOTES.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-1. Get the application URL by running these commands:
-{{- if .Values.ui.ingress.enabled }}
-{{- range $host := .Values.ui.ingress.hosts }}
- {{- range .paths }}
- http{{ if $.Values.ui.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
- {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.ui.service.type }}
- export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "dlab-ui.fullname" . }})
- export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
- echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.ui.service.type }}
- NOTE: It may take a few minutes for the LoadBalancer IP to be available.
- You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "dlab-ui.fullname" . }}'
- export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "dlab-ui.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
- echo http://$SERVICE_IP:{{ .Values.ui.service.http_port }}
-{{- else if contains "ClusterIP" .Values.ui.service.type }}
- export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "dlab-ui.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
- echo "Visit http://127.0.0.1:8080 to use your application"
- kubectl port-forward $POD_NAME 8080:80
-{{- end }}
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/_helpers.tpl b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/_helpers.tpl
deleted file mode 100644
index ca4bcd5..0000000
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/_helpers.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "dlab-ui.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "dlab-ui.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "dlab-ui.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "dlab-ui.labels" -}}
-app.kubernetes.io/name: {{ include "dlab-ui.name" . }}
-helm.sh/chart: {{ include "dlab-ui.chart" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/service.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/service.yaml
deleted file mode 100644
index 86c35dc..0000000
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/service.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-{{- /*
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-*/ -}}
-
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ include "dlab-ui.fullname" . }}
- labels:
-{{ include "dlab-ui.labels" . | indent 4 }}
-spec:
- type: {{ .Values.ui.service.type }}
- ports:
- - port: {{ .Values.ui.service.http_port }}
- targetPort: {{ .Values.ui.service.http_port }}
- protocol: TCP
- name: http
- - port: {{ .Values.ui.service.https_port }}
- targetPort: {{ .Values.ui.service.https_port }}
- protocol: TCP
- name: https
- selector:
- app.kubernetes.io/name: {{ include "dlab-ui.name" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/EnvironmentService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/EnvironmentService.java
index c605131..8abfdd3 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/EnvironmentService.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/EnvironmentService.java
@@ -34,6 +34,8 @@
void stopEnvironmentWithServiceAccount(String user);
+ void stopEnvironmentWithServiceAccount(String user);
+
void stopProjectEnvironment(String project);
void stopExploratory(UserInfo userInfo, String user, String project, String exploratoryName);
diff --git a/services/self-service/src/main/resources/webapp/src/assets/fonts/Material_Icons/LICENSE.txt b/services/self-service/src/main/resources/webapp/src/assets/fonts/Material_Icons/LICENSE.txt
new file mode 100755
index 0000000..75b5248
--- /dev/null
+++ b/services/self-service/src/main/resources/webapp/src/assets/fonts/Material_Icons/LICENSE.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ImageExploratoryResourceTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ImageExploratoryResourceTest.java
index d74f94e..089b308 100644
--- a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ImageExploratoryResourceTest.java
+++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ImageExploratoryResourceTest.java
@@ -246,6 +246,40 @@
}
@Test
+ public void getAllImagesForProject() {
+ when(imageExploratoryService.getImagesForProject(anyString())).thenReturn(getImageList());
+ final Response response = resources.getJerseyTest()
+ .target("/infrastructure_provision/exploratory_environment/image/all")
+ .queryParam("project", "someProject")
+ .request()
+ .header("Authorization", "Bearer " + TOKEN)
+ .get();
+
+ assertEquals(HttpStatus.SC_OK, response.getStatus());
+ assertEquals(getImageList(), response.readEntity(new GenericType<List<ImageInfoRecord>>() {}));
+ assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE));
+
+ verify(imageExploratoryService).getImagesForProject("someProject");
+ verifyNoMoreInteractions(imageExploratoryService);
+ }
+
+ @Test
+ public void getAllImagesForNullProject() {
+ when(imageExploratoryService.getImagesForProject(anyString())).thenReturn(getImageList());
+ final Response response = resources.getJerseyTest()
+ .target("/infrastructure_provision/exploratory_environment/image/all")
+ .request()
+ .header("Authorization", "Bearer " + TOKEN)
+ .get();
+
+ assertEquals(HttpStatus.SC_BAD_REQUEST, response.getStatus());
+ assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE));
+
+ verify(imageExploratoryService, never()).getImagesForProject(anyString());
+ verifyNoMoreInteractions(imageExploratoryService);
+ }
+
+ @Test
public void getImageWithException() {
doThrow(new ResourceNotFoundException("Image with name was not found for user"))
.when(imageExploratoryService).getImage(anyString(), anyString(), anyString(), anyString());
