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 e1e1792  added step-ca
e1e1792 is described below

commit e1e17927150393b6b29f3895d871f1027e5e8254
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Fri Nov 22 14:29:38 2019 +0200

    added step-ca
---
 .../gcp/ssn-gke/main/modules/helm_charts/step-ca-chart/values.yaml      | 2 +-
 .../terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca.tf           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca-chart/values.yaml
 
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca-chart/values.yaml
index 65d17f0..25881fd 100644
--- 
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca-chart/values.yaml
+++ 
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca-chart/values.yaml
@@ -35,7 +35,7 @@ ca:
   address: :9000
   # dns is the comma separated dns names to use. Leave it empty to use the 
format:
   # {include "step-certificates.fullname" .}.{ 
.Release.Namespace}.svc.cluster.local,127.0.0.1
-  dns:
+  dns: ${step_chart_name}.${namespace}.svc.cluster.local,${step_ca_host}
   # ${step_ca_host}
   # url is the http url where step-certificates will listen at. Leave it empty 
to use the format
   # https://{{ include "step-certificates.fullname" . }}.{{ .Release.Namespace 
}}.svc.cluster.local
diff --git 
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca.tf
 
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca.tf
index b0a7e7e..ebd831f 100644
--- 
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca.tf
+++ 
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca.tf
@@ -55,6 +55,8 @@ data "template_file" "step_ca_values" {
     step_ca_password             = random_string.step_ca_password.result
     step_ca_provisioner_password = 
random_string.step_ca_provisioner_password.result
     step_ca_host                 = 
kubernetes_service.step_service_lb.load_balancer_ingress.0.ip
+    step_chart_name              = local.step_ca_name
+    namespace                    = 
kubernetes_namespace.dlab-namespace.metadata[0].name
   }
 }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to