fix: assertoor double ingress

ethpandaops · Aug 8, 2024 · 8678282 · 8678282
1 parent 741d7ff
commit 8678282
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 5 deletions.
diff --git a/charts/assertoor/Chart.yaml b/charts/assertoor/Chart.yaml
@@ -6,7 +6,7 @@ home: https://github.com/ethpandaops/assertoor
 sources:
   - https://github.com/ethpandaops/assertoor
 type: application
-version: 0.0.2
+version: 0.0.3
 appVersion: "1.0.0"
 maintainers:
   - name: pk910

diff --git a/charts/assertoor/README.md b/charts/assertoor/README.md
@@ -1,7 +1,7 @@
 
 # assertoor
 
-![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.0.3](https://img.shields.io/badge/Version-0.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 Testing tool that is capable of doing actions and checking conditions on ethereum pos networks.
 
@@ -77,6 +77,8 @@ assertoorTests:
 | ingress.enabled | bool | `false` | Ingress resource for the HTTP API |
 | ingress.hosts[0].host | string | `"chart-example.local"` |  |
 | ingress.hosts[0].paths | list | `[]` |  |
+| ingress.hosts[1].host | string | `"chart-example-admin.local"` |  |
+| ingress.hosts[1].paths | list | `[]` |  |
 | ingress.tls | list | `[]` | Ingress TLS |
 | initContainers | list | `[]` | Additional init containers |
 | nameOverride | string | `""` | Overrides the chart's name |

diff --git a/charts/assertoor/templates/ingress.yaml b/charts/assertoor/templates/ingress.yaml
@@ -1,6 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "assertoor.fullname" . -}}
-{{- $svcPort := include "assertoor.httpPort" . -}}
+{{- $svcPortAdmin := include "assertoor.httpPort" . -}}
+{{- $svcPortPublic := include "assertoor.publicHttpPort" . -}}
 {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
   {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
   {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
@@ -38,6 +39,7 @@ spec:
   {{- end }}
   rules:
     {{- range .Values.ingress.hosts }}
+    {{- if and (contains "admin" .host) (semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion) }}
     - host: {{ .host | quote }}
       http:
         paths:
@@ -51,11 +53,32 @@ spec:
               service:
                 name: {{ $fullName }}
                 port:
-                  number: {{ $svcPort }}
+                  number: {{ $svcPortAdmin }}
               {{- else }}
               serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
+              servicePort: {{ $svcPortAdmin }}
               {{- end }}
           {{- end }}
+    {{- else }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            pathType: {{ .pathType }}
+            {{- end }}
+            backend:
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPortPublic }}
+              {{- else }}
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPortPublic }}
+              {{- end }}
+          {{- end }}
+      {{- end }}
     {{- end }}
 {{- end }}
diff --git a/charts/assertoor/values.yaml b/charts/assertoor/values.yaml
@@ -27,9 +27,13 @@ ingress:
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   # -- Ingress host
+  # -- if you set "admin" in the hostname it will use the admin service (8080)
+  # -- if you do not set admin in the hostname it will use the public service (8082)
   hosts:
     - host: chart-example.local
       paths: []
+    - host: chart-example-admin.local
+      paths: []
   # -- Ingress TLS
   tls: []
   #  - secretName: chart-example-tls