You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/09/24 09:40:16 UTC
[incubator-dlab] branch DLAB-terraform updated: made changes to AWS
DLab UI service
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-terraform by this push:
new 66c796c made changes to AWS DLab UI service
66c796c is described below
commit 66c796c4b826d4f2cb4d52059c927975d9e5a073
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Tue Sep 24 12:40:07 2019 +0300
made changes to AWS DLab UI service
---
.../dlab-ui-chart/templates/configmap-ui-conf.yaml | 28 ----------------------
.../ssn-helm-charts/main/dlab-ui-chart/values.yaml | 19 ---------------
.../terraform/aws/ssn-helm-charts/main/dlab-ui.tf | 13 ----------
.../aws/ssn-helm-charts/main/variables.tf | 14 -----------
4 files changed, 74 deletions(-)
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ui-conf.yaml b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ui-conf.yaml
index b73696c..efa6f2a 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ui-conf.yaml
+++ b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ui-conf.yaml
@@ -243,31 +243,3 @@ data:
gzipEnabled: true
gzipEnabledForRequests: false
chunkedEncodingEnabled: true
-
- cloudProperties:
- os: {{ .Values.ui.cloud_properties.env_os }}
- serviceBaseName: {{ .Values.ui.cloud_properties.service_base_name }}
- edgeInstanceSize: {{ .Values.ui.cloud_properties.edge_instanse_shape }}
- subnetId: {{ .Values.ui.cloud_properties.subnet_id }}
- region: {{ .Values.ui.cloud_properties.region }}
- zone: {{ .Values.ui.cloud_properties.zone }}
- confTagResourceId: "{{ .Values.ui.cloud_properties.tag_resource_id }}"
- securityGroupIds: {{ .Values.ui.cloud_properties.security_group_ids }}
- ssnInstanceSize: {{ .Values.ui.cloud_properties.ssn_instance_shape }}
- notebookVpcId: {{ .Values.ui.cloud_properties.vpc_id }}
- notebookSubnetId: {{ .Values.ui.cloud_properties.subnet_id }}
- confKeyDir: {{ .Values.ui.cloud_properties.key_dir }}
- vpcId: {{ .Values.ui.cloud_properties.vpc_id }}
- peeringId:
- azureResourceGroupName:
- ssnStorageAccountTagName:
- sharedStorageAccountTagName:
- datalakeTagName:
- azureClientId:
- gcpProjectId:
- ldap:
- host: {{ .Values.ui.cloud_properties.ldap.host }}
- dn: {{ .Values.ui.cloud_properties.ldap.dn }}
- ou: {{ .Values.ui.cloud_properties.ldap.ou }}
- user: {{ .Values.ui.cloud_properties.ldap.user }}
- password: {{ .Values.ui.cloud_properties.ldap.password }}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/values.yaml b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/values.yaml
index 06f274b..5a6a396 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/values.yaml
+++ b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/values.yaml
@@ -58,22 +58,3 @@ ui:
keycloak:
auth_server_url: http://${ssn_k8s_alb_dns_name}/auth
redirect_uri: http://${ssn_k8s_alb_dns_name}/
-
- cloud_properties:
- env_os: ${env_os}
- service_base_name: ${service_base_name}
- edge_instanse_shape: "t2.medium"
- subnet_id: ${subnet_id}
- region: ${region}
- zone: ${zone}
- tag_resource_id: "user:tag"
- security_group_ids: ${security_group_ids}
- ssn_instance_shape: ${ssn_instance_shape}
- vpc_id: ${vpc_id}
- key_dir: "/root/keys/"
- ldap:
- host: ${ldap_host}
- dn: ${ldap_dn}
- ou: ${ldap_ou}
- user: ${ldap_user}
- password: ${ldap_password}
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui.tf b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui.tf
index 36a5b92..e625c4b 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui.tf
+++ b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui.tf
@@ -29,19 +29,6 @@ data "template_file" "dlab_ui_values" {
ssn_k8s_alb_dns_name = var.ssn_k8s_alb_dns_name
ssn_bucket_name = var.ssn_bucket_name
provision_service_host = var.endpoint_eip_address
- env_os = var.env_os
- service_base_name = var.service_base_name
- subnet_id = var.ssn_subnet
- region = var.region
- zone = var.zone
- security_group_ids = var.ssn_k8s_sg_id
- ssn_instance_shape = var.ssn_k8s_masters_shape
- vpc_id = var.ssn_vpc_id
- ldap_host = var.ldap_host
- ldap_dn = var.ldap_dn
- ldap_ou = var.ldap_users_group
- ldap_user = var.ldap_user
- ldap_password = var.ldap_bind_creds
}
}
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/variables.tf b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/variables.tf
index 1c2c027..040b126 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/variables.tf
+++ b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/variables.tf
@@ -104,22 +104,8 @@ variable "ssn_bucket_name" {}
variable "endpoint_eip_address" {}
-variable "region" {}
-
-variable "zone" {}
-
-variable "ssn_vpc_id" {}
-
-variable "ssn_subnet" {}
-
variable "service_base_name" {}
-variable "ssn_k8s_sg_id" {}
-
-variable "env_os" {}
-
-variable "ssn_k8s_masters_shape" {}
-
variable "tag_resource_id" {}
variable "billing_bucket" {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org