You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/07/15 08:54:16 UTC
[incubator-dlab] branch DLAB-836 updated: [DLAB-792]: refactored
DLAB-ui chart
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 17b5e35 [DLAB-792]: refactored DLAB-ui chart
17b5e35 is described below
commit 17b5e3502b29dfc0b6d1f3a1d6836d2a703c461d
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Mon Jul 15 11:54:08 2019 +0300
[DLAB-792]: refactored DLAB-ui chart
---
.../dlab-ui-chart/templates/deployment.yaml | 25 ++++++++++++----------
.../dlab-ui/dlab-ui-chart/templates/ingress.yaml | 4 +++-
.../dlab-ui/dlab-ui-chart/templates/service.yaml | 6 ++++--
.../aws/modules/dlab-ui/dlab-ui-chart/values.yaml | 6 ++++--
4 files changed, 25 insertions(+), 16 deletions(-)
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 4213083..5d7afe1 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
@@ -45,17 +45,20 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
- - name: https
- containerPort: 443
- protocol: TCP
- livenessProbe:
- httpGet:
- path: /
- port: http
- readinessProbe:
- httpGet:
- path: /
- port: http
+# - name: https
+# containerPort: 443
+# protocol: TCP
+ - name: http
+ containerPort: 80
+ protocol: TCP
+# livenessProbe:
+# httpGet:
+# path: /
+# port: http
+# readinessProbe:
+# httpGet:
+# path: /
+# port: http
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- with .Values.nodeSelector }}
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 c5e02f4..fdc5e0e 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
@@ -28,6 +28,7 @@ metadata:
{{ include "dlab-ui.labels" . | indent 4 }}
{{- with .Values.ingress.annotations }}
annotations:
+ nginx.ingress.kubernetes.io/ssl-redirect: "false"
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
@@ -49,7 +50,8 @@ spec:
- path: {{ . }}
backend:
serviceName: {{ $fullName }}
- servicePort: 443
+ # servicePort: 443
+ servicePort: 80
{{- 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 826277a..a88e594 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
@@ -29,9 +29,11 @@ spec:
type: {{ .Values.service.type }}
ports:
- port: {{ .Values.service.port }}
- targetPort: 58443
+ #targetPort: 58443
+ targetPort: 58080
protocol: TCP
- name: https
+ #name: https
+ name: http
selector:
app.kubernetes.io/name: {{ include "dlab-ui.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
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 2c8021c..e37ee86 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
@@ -28,7 +28,8 @@ replicaCount: 1
image:
repository: koppox/dlab-ui
tag: '1.3-hardj'
- pullPolicy: IfNotPresent
+ # pullPolicy: IfNotPresent
+ pullPolicy: Always
#imagePullSecrets: []
#nameOverride: ""
@@ -36,7 +37,8 @@ image:
service:
type: NodePort
- port: 58443
+# port: 58443
+ port: 58080
ingress:
enabled: true
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org