Skip to content

Commit 64f456b

Browse files
committed
Use ingress in webui helm chart
poo: https://progress.opensuse.org/issues/183608
1 parent 2a303f1 commit 64f456b

File tree

4 files changed

+14
-3
lines changed

4 files changed

+14
-3
lines changed

container/helm/charts/webui/templates/deployment.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ spec:
1616
labels:
1717
{{- include "webui.selectorLabels" . | nindent 8 }}
1818
spec:
19+
initContainers:
20+
- name: wait-for-db
21+
image: "postgres:latest"
22+
command: ["sh", "-c", "until pg_isready -h db -p 5432; do echo waiting for database; sleep 2; done;"]
1923
containers:
2024
# Future enhancement option: a container with rsync for setup with cache service
2125
- name: {{ include "webui.fullname" . }}-scheduler
@@ -56,6 +60,10 @@ spec:
5660
readinessProbe:
5761
exec:
5862
command: ["curl", "-f", "http://localhost:9527"]
63+
# Give the app 15 seconds to start before probing
64+
initialDelaySeconds: 15
65+
# Give the probe 5 seconds to respond
66+
timeoutSeconds: 5
5967
- name: {{ include "webui.fullname" . }}-gru
6068
image: "{{ .Values.image.name }}:{{ .Values.image.tag }}"
6169
imagePullPolicy: {{ .Values.image.pullPolicy }}

container/helm/charts/webui/templates/ingress.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Ingress
33
metadata:
44
name: {{ include "webui.fullname" . }}-ingress
55
spec:
6-
ingressClassName: traefik
6+
ingressClassName: {{ .Values.ingress.className }}
77
rules:
88
- host: {{ .Values.baseUrl }}
99
http:

container/helm/charts/webui/values.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
enabled: true
2-
baseUrl: openqa.host
2+
baseUrl: openqa.host.org
33
useHttps: false
44
key: 1234567890ABCDEF
55
secret: 1234567890ABCDEF
66
image:
77
name: registry.opensuse.org/devel/openqa/containers15.6/openqa_webui
88
pullPolicy: Always
99
tag: "latest"
10+
ingress:
11+
enabled: true
12+
className: "nginx"
1013
postgresql:
1114
enabled: true
1215
fullnameOverride: db

container/helm/charts/worker/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ image:
44
pullPolicy: Always
55
tag: "latest"
66
openqa:
7-
host: openqa.host
7+
host: openqa.host.org
88
key: 1234567890ABCDEF
99
secret: 1234567890ABCDEF
1010
cacheService: false

0 commit comments

Comments
 (0)