[incubator-dlab] branch DLAB-1158 updated: fixed typo

[omartushevskyi]

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

omartushevskyi pushed a commit to branch DLAB-1158
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-1158 by this push:
     new d227f35  fixed typo
d227f35 is described below

commit d227f35644bc16399d264e1f9c2777d33ce43a52
Author: Oleh Martushevskyi <oleh_martushevs...@epam.com>
AuthorDate: Wed Nov 6 13:20:28 2019 +0200

    fixed typo
---
 .../terraform/aws/ssn-helm-charts/main/dlab-ui.tf           | 13 +++++++------
 infrastructure-provisioning/terraform/bin/dlab.py           |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

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 b4bf62c..92f8677 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
@@ -20,11 +20,12 @@
 # 
******************************************************************************
 
 locals {
-    custom_cert_name = var.custom_certs_enabled == "true" ? reverse(split("/", 
var.custom_cert_path))[0] : "None"
-    custom_key_name = var.custom_certs_enabled == "true" ? reverse(split("/", 
var.custom_key_path))[0] : "None"
-    custom_cert = var.custom_certs_enabled == "true" ? 
base64encode(file("/tmp/${local.custom_cert_name}")) : "None"
-    custom_key = var.custom_certs_enabled == "true" ? 
base64encode(file("/tmp/${local.custom_key_name}")) : "None"
-    ui_host = var.custom_certs_enabled == "true" ? var.custom_certs_host : 
data.kubernetes_service.nginx-service.load_balancer_ingress.0.hostname
+    custom_certs_enabled = lower(var.custom_certs_enabled)
+    custom_cert_name = local.custom_certs_enabled == "true" ? 
reverse(split("/", var.custom_cert_path))[0] : "None"
+    custom_key_name = local.custom_certs_enabled == "true" ? 
reverse(split("/", var.custom_key_path))[0] : "None"
+    custom_cert = local.custom_certs_enabled == "true" ? 
base64encode(file("/tmp/${local.custom_cert_name}")) : "None"
+    custom_key = local.custom_certs_enabled == "true" ? 
base64encode(file("/tmp/${local.custom_key_name}")) : "None"
+    ui_host = local.custom_certs_enabled == "true" ? var.custom_certs_host : 
data.kubernetes_service.nginx-service.load_balancer_ingress.0.hostname
 }
 
 data "template_file" "dlab_ui_values" {
@@ -39,7 +40,7 @@ data "template_file" "dlab_ui_values" {
       service_base_name      = var.service_base_name
       os                     = var.env_os
       namespace              = 
kubernetes_namespace.dlab-namespace.metadata[0].name
-      custom_certs_enabled   = var.custom_certs_enabled
+      custom_certs_enabled   = local.custom_certs_enabled
       custom_certs_crt       = local.custom_cert
       custom_certs_key       = local.custom_key
       step_ca_crt            = 
lookup(data.external.step-ca-config-values.result, "rootCa")
diff --git a/infrastructure-provisioning/terraform/bin/dlab.py 
b/infrastructure-provisioning/terraform/bin/dlab.py
index e8b8333..8589f80 100644
--- a/infrastructure-provisioning/terraform/bin/dlab.py
+++ b/infrastructure-provisioning/terraform/bin/dlab.py
@@ -685,7 +685,7 @@ class AWSK8sSourceBuilder(AbstractDeployBuilder):
          .add_str('--billing_tag', 'Billing tag', default='dlab',
                   group='helm_charts')
          .add_bool('--custom_certs_enabled', 'Enable custom certificates',
-                   default='false', group=('service', 'helm_charts'))
+                   default=False, group=('service', 'helm_charts'))
          .add_str('--custom_cert_path', 'custom_cert_path', default='', 
group=('service', 'helm_charts'))
          .add_str('--custom_key_path', 'custom_key_path', default='', 
group=('service', 'helm_charts'))
          .add_str('--custom_certs_host', 'custom certs host', default='', 
group='helm_charts')
@@ -868,7 +868,7 @@ class AWSK8sSourceBuilder(AbstractDeployBuilder):
         self.check_k8s_cluster_status()
         self.check_tiller_status()
         self.copy_terraform_to_remote()
-        if self.service_args.get('custom_certs_enabled') == 'true':
+        if self.service_args.get('custom_certs_enabled'):
             self.copy_cert()
         self.run_remote_terraform()
         self.fill_remote_terraform_output()


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