created specific ingress for requests to api/bootstrap from outside t…

…he cluster (#20) * created specific ingress for requests to api/bootstrap from outside the cluster Signed-off-by: Savvas Kyriacou <[email protected]> * Update bootstrap ingress rewrite path Signed-off-by: Eamonn Mansour <[email protected]> * Fix webui liveness and readiness probe warnings Signed-off-by: Eamonn Mansour <[email protected]> * Update bootstrap ingress name Signed-off-by: Eamonn Mansour <[email protected]> --------- Signed-off-by: Savvas Kyriacou <[email protected]> Signed-off-by: Eamonn Mansour <[email protected]> Co-authored-by: Eamonn Mansour <[email protected]>
galasa-dev · Apr 16, 2024 · 6b3419d · 6b3419d
1 parent 7935679
commit 6b3419d
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 5 deletions.
diff --git a/charts/ecosystem/templates/api-bootstrap-ingress.yaml b/charts/ecosystem/templates/api-bootstrap-ingress.yaml
@@ -0,0 +1,33 @@
+#
+# Copyright contributors to the Galasa project
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ .Release.Name }}-api-bootstrap
+  annotations:
+    {{- with .Values.ingress.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+    nginx.ingress.kubernetes.io/rewrite-target: /bootstrap/external
+spec:
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+  {{- with .Values.ingress.tls }}
+  tls:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  rules:
+  - host: {{ .Values.externalHostname }}
+    http:
+      paths:
+      - path: /api/bootstrap
+        pathType: ImplementationSpecific
+        backend:
+          service:
+            name: {{ .Release.Name }}-api
+            port:
+              number: 8080
+
diff --git a/charts/ecosystem/templates/api-ingress.yaml b/charts/ecosystem/templates/api-ingress.yaml
@@ -23,7 +23,7 @@ spec:
   - host: {{ .Values.externalHostname }}
     http:
       paths:
-      - path: /api(/|$)(.*)
+      - path: /api(/|$)((?!bootstrap).*)
         pathType: ImplementationSpecific
         backend:
           service:

diff --git a/charts/ecosystem/templates/webui.yaml b/charts/ecosystem/templates/webui.yaml
@@ -66,14 +66,12 @@ spec:
         - containerPort: 8080
           name: http
         livenessProbe:
-          httpGet:
-            path: /
+          tcpSocket:
             port: 8080
           initialDelaySeconds: 5
           periodSeconds: 60
         readinessProbe:
-          httpGet:
-            path: /
+          tcpSocket:
             port: 8080
           initialDelaySeconds: 5
           periodSeconds: 10