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 efd9f16 added additional parameters for DLab UI
new b658192 Merge remote-tracking branch 'origin/DLAB-terraform' into
DLAB-terraform
efd9f16 is described below
commit efd9f1661940f388fb74e39aa8f56939bf19b5ed
Author: Oleh Martushevskyi <oleh_martushevs...@epam.com>
AuthorDate: Wed Sep 18 10:52:13 2019 +0300
added additional parameters for DLab UI
---
.../src/general/scripts/aws/ssn_configure.py | 4 ++++
.../src/general/scripts/azure/ssn_configure.py | 4 ++++
.../src/general/scripts/gcp/ssn_configure.py | 12 ++++++++----
.../main/dlab-ui-chart/templates/configmap-ui-conf.yaml | 1 +
.../terraform/gcp/ssn-gke/main/main.tf | 2 ++
.../terraform/gcp/ssn-gke/main/modules/gke/outputs.tf | 8 ++++++++
.../dlab-ui-chart/templates/configmap-ui-conf.yaml | 9 +++++----
.../main/modules/helm_charts/dlab-ui-chart/values.yaml | 5 +++++
.../gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf | 5 +++++
.../gcp/ssn-gke/main/modules/helm_charts/variables.tf | 3 +++
services/self-service/self-service.yml | 1 +
11 files changed, 46 insertions(+), 8 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index ae88c15..1f1d66d 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -435,6 +435,10 @@ if __name__ == "__main__":
'value': ''
},
{
+ 'key': 'GCP_PROJECT_ID',
+ 'value': ''
+ },
+ {
'key': 'AZURE_CLIENT_ID',
'value': ''
}
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
index c99c649..ea24afa 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
@@ -288,6 +288,10 @@ if __name__ == "__main__":
'value': ssn_conf['shared_storage_account_name']
},
{
+ 'key': 'GCP_PROJECT_ID',
+ 'value': ''
+ },
+ {
'key': 'SUBNET2_ID',
'value': ''
},
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index 25d8208..a407c10 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -288,15 +288,15 @@ if __name__ == "__main__":
},
{
'key': 'SUBNET_ID',
- 'value': ''
+ 'value': ssn_conf['subnet_name']
},
{
'key': 'REGION',
- 'value': ''
+ 'value': ssn_conf['region']
},
{
'key': 'ZONE',
- 'value': ''
+ 'value': ssn_conf['zone']
},
{
'key': 'TAG_RESOURCE_ID',
@@ -312,7 +312,7 @@ if __name__ == "__main__":
},
{
'key': 'VPC_ID',
- 'value': ''
+ 'value': ssn_conf['vpc_name']
},
{
'key': 'CONF_KEY_DIR',
@@ -355,6 +355,10 @@ if __name__ == "__main__":
'value': ''
},
{
+ 'key': 'GCP_PROJECT_ID',
+ 'value': os.environ['gcp_project_id']
+ },
+ {
'key': 'AZURE_CLIENT_ID',
'value': ''
},
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 74f4041..fd5138a 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
@@ -263,6 +263,7 @@ data:
sharedStorageAccountTagName:
datalakeTagName:
azureClientId:
+ gcpProjectId:
ldap:
host: {{ .Values.ui.cloud_properties.ldap.host }}
dn: {{ .Values.ui.cloud_properties.ldap.dn }}
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
index 2ceafb5..17b655c 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
@@ -71,4 +71,6 @@ module "helm_charts" {
endpoint_keystore_password = var.endpoint_keystore_password
gke_cluster_name = module.gke_cluster.gke_cluster_name
big_query_dataset = var.big_query_dataset
+ vpc_name = module.gke_cluster.vpc_name
+ subnet_name = module.gke_cluster.subnet_name
}
\ 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
index 0ea1094..340847c 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/outputs.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/outputs.tf
@@ -29,4 +29,12 @@ output "endpoint_keystore_password" {
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/helm_charts/dlab-ui-chart/templates/configmap-ui-conf.yaml
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/configmap-ui-conf.yaml
index 5de76a6..470fd75 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/configmap-ui-conf.yaml
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/configmap-ui-conf.yaml
@@ -247,22 +247,23 @@ data:
os: {{ .Values.ui.cloud_properties.env_os }}
serviceBaseName: {{ .Values.ui.cloud_properties.service_base_name }}
edgeInstanceSize:
- subnetId:
- region:
- zone:
+ subnetId: {{ .Values.ui.cloud_properties.subnet_name }}
+ region: {{ .Values.ui.cloud_properties.region }}
+ zone: {{ .Values.ui.cloud_properties.zone }}
confTagResourceId:
securityGroupIds:
ssnInstanceSize:
notebookVpcId:
notebookSubnetId:
confKeyDir: {{ .Values.ui.cloud_properties.key_dir }}
- vpcId:
+ vpcId: {{ .Values.ui.cloud_properties.vpc_name }}
peeringId:
azureResourceGroupName:
ssnStorageAccountTagName:
sharedStorageAccountTagName:
datalakeTagName:
azureClientId:
+ gcpProjectId: {{ .Values.ui.cloud_properties.project_id }}
ldap:
host: {{ .Values.ui.cloud_properties.ldap.host }}
dn: {{ .Values.ui.cloud_properties.ldap.dn }}
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml
index e85f590..0b3bdd5 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml
@@ -61,6 +61,11 @@ ui:
env_os: ${env_os}
service_base_name: ${service_base_name}
key_dir: "/root/keys/"
+ vpc_name: ${vpc_name}
+ subnet_name: ${subnet_name}
+ region: ${region}
+ zone: ${zone}
+ project_id: ${project_id}
ldap:
host: ${ldap_host}
dn: ${ldap_dn}
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf
index 43d3d19..8719d32 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf
@@ -27,6 +27,11 @@ data "template_file" "dlab_ui_values" {
mongo_port = var.mongo_service_port
mongo_service_name = var.mongo_service_name
ssn_k8s_alb_dns_name =
data.kubernetes_service.nginx_service.load_balancer_ingress.0.ip
+ vpc_name = var.vpc_name
+ subnet_name = var.subnet_name
+ region = var.region
+ zone = var.zone
+ project_id = var.project_id
provision_service_host = "127.0.0.1" # var.endpoint_eip_address
env_os = var.env_os
service_base_name = var.service_base_name
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/variables.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/variables.tf
index 3954642..efca923 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/variables.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/variables.tf
@@ -75,6 +75,9 @@ variable "gke_cluster_name" {}
variable "big_query_dataset" {}
+variable "vpc_name" {}
+
+variable "subnet_name" {}
//variable "nginx_http_port" {
// default = "31080"
// description = "Sets the nodePort that maps to the Ingress' port 80"
diff --git a/services/self-service/self-service.yml
b/services/self-service/self-service.yml
index c967f58..7aa0080 100644
--- a/services/self-service/self-service.yml
+++ b/services/self-service/self-service.yml
@@ -213,6 +213,7 @@ cloudProperties:
sharedStorageAccountTagName: AZURE_SHARED_STORAGE_ACCOUNT_TAG
datalakeTagName: AZURE_DATALAKE_TAG
azureClientId: AZURE_CLIENT_ID
+ gcpProjectId: GCP_PROJECT_ID
ldap:
host: LDAP_HOST
dn: LDAP_DN
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
