[incubator-dlab] branch DLAB-1158 updated: added step-ca

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

commit bdd57226adbc95326a02a8dbcaa4835cfb2ecb73
Author: Oleh Martushevskyi <oleh_martushevs...@epam.com>
AuthorDate: Wed Nov 27 16:03:26 2019 +0200

    added step-ca
---
 .../helm_charts/dlab-ui-chart/templates/ingress.yaml       | 14 +++++++-------
 .../main/modules/helm_charts/dlab-ui-chart/values.yaml     |  5 +++--
 .../main/modules/helm_charts/files/nginx_values.yaml       |  4 +++-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git 
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/ingress.yaml
 
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/ingress.yaml
index 2364694..4a9b809 100644
--- 
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/ingress.yaml
+++ 
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/ingress.yaml
@@ -23,7 +23,7 @@
 
 {{- if .Values.ui.ingress.enabled -}}
 {{- $fullName := include "dlab-ui.fullname" . -}}
-{{ $servicePort := .Values.ui.service.http_port }}
+{{ $servicePort := .Values.ui.service.https_port }}
 {{ $host := .Values.ui.ingress.host }}
 apiVersion: extensions/v1beta1
 kind: Ingress
@@ -36,12 +36,12 @@ metadata:
 {{ toYaml . | indent 4 }}
   {{- end }}
 spec:
-{{- if .Values.ui.ingress.tls }}
-  tls:
-  {{- range .Values.ui.ingress.tls }}
-    - secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
+#{{- if .Values.ui.ingress.tls }}
+#  tls:
+#  {{- range .Values.ui.ingress.tls }}
+#    - secretName: {{ .secretName }}
+#  {{- end }}
+#{{- end }}
   rules:
     - http:
         paths:
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 b6be089..0d04603 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
@@ -37,14 +37,15 @@ ui:
   service:
     type: ClusterIP
     #  port: 58443
-    http_port: 58080
-    https_port: 58443
+    http_port: 80
+    https_port: 443
   ingress:
     enabled: true
     host: ${ssn_k8s_alb_dns_name}
     annotations:
       kubernetes.io/ingress.class: nginx
       nginx.ingress.kubernetes.io/ssl-redirect: "true"
+      nginx.ingress.kubernetes.io/ssl-passthrough: "true"
     tls:
       - secretName: dlab-ui-tls
   mongo:
diff --git 
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/nginx_values.yaml
 
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/nginx_values.yaml
index a484a42..98a5545 100644
--- 
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/nginx_values.yaml
+++ 
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/nginx_values.yaml
@@ -21,4 +21,6 @@
 
 controller:
   service:
-    type: LoadBalancer
\ No newline at end of file
+    type: LoadBalancer
+  extraArgs:
+    enable-ssl-passthrough: true
\ No newline at end of file


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