This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-836
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-836 by this push:
new 73b5ab2 [DLAB-792]: refactored DLAB-ui chart
73b5ab2 is described below
commit 73b5ab2a4303f18d81ee6ae188efbeb4a239dfa4
Author: Oleh Martushevskyi <oleh_martushevs...@epam.com>
AuthorDate: Mon Jul 15 13:11:31 2019 +0300
[DLAB-792]: refactored DLAB-ui chart
---
infrastructure-provisioning/terraform/aws/main/main.tf | 4 ++++
.../dlab-ui/dlab-ui-chart/templates/deployment.yaml | 7 +++++--
.../modules/dlab-ui/dlab-ui-chart/templates/ingress.yaml | 14 ++++++++------
.../modules/dlab-ui/dlab-ui-chart/templates/service.yaml | 2 ++
.../aws/modules/dlab-ui/dlab-ui-chart/values.yaml | 1 +
5 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/infrastructure-provisioning/terraform/aws/main/main.tf
b/infrastructure-provisioning/terraform/aws/main/main.tf
index 10d3ad3..2ed5212 100644
--- a/infrastructure-provisioning/terraform/aws/main/main.tf
+++ b/infrastructure-provisioning/terraform/aws/main/main.tf
@@ -153,6 +153,10 @@ module "mongo" {
source = "../modules/mongo"
}
+module "keycloak" {
+ source = "../modules/keycloak"
+}
+
output "ssn_k8s_masters_ip_addresses" {
value = module.ssn-k8s.ssn_k8s_masters_ip_addresses
}
\ No newline at end of file
diff --git
a/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/templates/deployment.yaml
b/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/templates/deployment.yaml
index 5d7afe1..1fdaba0 100644
---
a/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/templates/deployment.yaml
+++
b/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{- /*
# *****************************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
@@ -18,6 +19,8 @@
# under the License.
#
#
******************************************************************************
+*/ -}}
+
apiVersion: apps/v1
kind: Deployment
metadata:
@@ -49,8 +52,8 @@ spec:
# containerPort: 443
# protocol: TCP
- name: http
- containerPort: 80
- protocol: TCP
+ containerPort: 80
+ protocol: TCP
# livenessProbe:
# httpGet:
# path: /
diff --git
a/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/templates/ingress.yaml
b/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/templates/ingress.yaml
index fdc5e0e..e556b1f 100644
---
a/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/templates/ingress.yaml
+++
b/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/templates/ingress.yaml
@@ -1,4 +1,5 @@
-# *****************************************************************************
+{{- /*
+#
******************************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -18,18 +19,20 @@
# under the License.
#
#
******************************************************************************
+*/ -}}
+
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "dlab-ui.fullname" . -}}
+{{ $servicePort := .Values.service.port }}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: {{ $fullName }}
labels:
{{ include "dlab-ui.labels" . | indent 4 }}
- {{- with .Values.ingress.annotations }}
annotations:
- nginx.ingress.kubernetes.io/ssl-redirect: "false"
- {{- toYaml . | nindent 4 }}
+{{- with .Values.ingress.annotations }}
+{{ toYaml . | indent 4 }}
{{- end }}
spec:
{{- if .Values.ingress.tls }}
@@ -50,8 +53,7 @@ spec:
- path: {{ . }}
backend:
serviceName: {{ $fullName }}
- # servicePort: 443
- servicePort: 80
+ servicePort: {{ $servicePort }}
{{- end }}
{{- end }}
{{- end }}
\ No newline at end of file
diff --git
a/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/templates/service.yaml
b/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/templates/service.yaml
index a88e594..ad4fc4b 100644
---
a/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/templates/service.yaml
+++
b/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/templates/service.yaml
@@ -1,3 +1,4 @@
+{{- /*
# *****************************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
@@ -18,6 +19,7 @@
# under the License.
#
#
******************************************************************************
+*/ -}}
apiVersion: v1
kind: Service
diff --git
a/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/values.yaml
b/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/values.yaml
index e37ee86..f183afd 100644
---
a/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/values.yaml
+++
b/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/values.yaml
@@ -44,6 +44,7 @@ ingress:
enabled: true
annotations:
kubernetes.io/ingress.class: nginx
+ nginx.ingress.kubernetes.io/ssl-redirect: "false"
# kubernetes.io/tls-acme: "true"
rules:
- paths: [/]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
