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 db66c67 added additional parameter;
new 08e4d6e Merge remote-tracking branch 'origin/DLAB-terraform' into
DLAB-terraform
db66c67 is described below
commit db66c671d483c2b160aca4293867f81b2b096777
Author: Oleh Martushevskyi <oleh_martushevs...@epam.com>
AuthorDate: Thu Sep 19 14:30:35 2019 +0300
added additional parameter;
---
infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf | 1 +
.../modules/helm_charts/dlab-ui-chart/templates/configmap-ui-conf.yaml | 1 +
.../gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml | 1 +
.../terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf | 1 +
.../terraform/gcp/ssn-gke/main/modules/helm_charts/variables.tf | 2 ++
5 files changed, 6 insertions(+)
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
index aa9948a..27589f5 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
@@ -67,4 +67,5 @@ 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
+ env_os = var.env_os
}
\ 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 43878da..4b05d5c 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
@@ -122,6 +122,7 @@ data:
</#if>
serviceBaseName: {{ .Values.ui.service_base_name }}
+ os: {{ .Values.ui.os }}
server:
requestLog:
appenders:
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 bf3e0e1..4bb1eb4 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
@@ -28,6 +28,7 @@ labels: {}
ui:
service_base_name: ${service_base_name}
+ os: ${os}
image:
repository: epamdlab/ui
tag: '0.1-gcp'
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 ed2f84b..66ca896 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
@@ -29,6 +29,7 @@ data "template_file" "dlab_ui_values" {
ssn_k8s_alb_dns_name =
data.kubernetes_service.nginx_service.load_balancer_ingress.0.ip
provision_service_host = "127.0.0.1" # var.endpoint_eip_address
service_base_name = var.service_base_name
+ os = var.env_os
}
}
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 a48d123..6c08f23 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
@@ -66,6 +66,8 @@ variable "endpoint_keystore_password" {}
variable "gke_cluster_name" {}
variable "big_query_dataset" {}
+
+variable "env_os" {}
//variable "nginx_http_port" {
// default = "31080"
// description = "Sets the nodePort that maps to the Ingress' port 80"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
