From 6ae6c6875b665a839f707a0854f72fc771ba9894 Mon Sep 17 00:00:00 2001
From: Thomas Stocker <thomas.stocker.pro@gmail.com>
Date: Tue, 4 Nov 2025 15:37:51 +0100
Subject: [PATCH] fix: ingress issue that didn't discover the right service

Signed-off-by: Thomas Stocker <thomas.stocker.pro@gmail.com>
---
 contrib/helm/charts/probo/templates/ingress.yaml | 6 ++++--
 contrib/helm/charts/probo/values.yaml            | 7 ++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/contrib/helm/charts/probo/templates/ingress.yaml b/contrib/helm/charts/probo/templates/ingress.yaml
index 3e47f2532..fe20cc921 100644
--- a/contrib/helm/charts/probo/templates/ingress.yaml
+++ b/contrib/helm/charts/probo/templates/ingress.yaml
@@ -24,6 +24,8 @@ spec:
     {{- end }}
   {{- end }}
   rules:
+    {{- $fullName := include "probo.fullname" . }}
+    {{- $servicePort := .Values.service.port }}
     {{- range .Values.ingress.hosts }}
     - host: {{ .host | quote }}
       http:
@@ -33,9 +35,9 @@ spec:
             pathType: {{ .pathType }}
             backend:
               service:
-                name: {{ default (include "probo.fullname" $) .backend.service.name }}
+                name: {{ if and .backend .backend.service .backend.service.name }}{{ .backend.service.name }}{{ else }}{{ $fullName }}{{ end }}
                 port:
-                  number: {{ default $.Values.service.port .backend.service.port.number }}
+                  number: {{ if and .backend .backend.service .backend.service.port .backend.service.port.number }}{{ .backend.service.port.number }}{{ else }}{{ $servicePort }}{{ end }}
           {{- end }}
     {{- end }}
 {{- end }}
diff --git a/contrib/helm/charts/probo/values.yaml b/contrib/helm/charts/probo/values.yaml
index 21e14282c..c976a3f50 100644
--- a/contrib/helm/charts/probo/values.yaml
+++ b/contrib/helm/charts/probo/values.yaml
@@ -85,11 +85,8 @@ ingress:
       paths:
         - path: /
           pathType: Prefix
-          backend:
-            service:
-              name: probo
-              port:
-                number: 8080
+          # backend service name and port are automatically set to the probo service
+          # unless explicitly overridden here
   tls: []
   #  - secretName: probo-tls
   #    hosts: