From f169fdfe5b7acbbc25dd0761f3197341ca0c366e Mon Sep 17 00:00:00 2001
From: urupaud <35029043+urupaud@users.noreply.github.com>
Date: Thu, 17 Aug 2023 20:50:57 +1000
Subject: [PATCH] =?UTF-8?q?fixed=20the=20issue=20throws=20when=20using=20t?=
 =?UTF-8?q?he=20precedingPaths=20and=20updated=20to=20a=E2=80=A6=20(#13)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fixed the issue throws when using the precedingPaths and updated to accpet use-annotation as the port name

* change chart version

---------

Co-authored-by: Udara Rupasinghe <udara.rupasinghe@linnworks.com>
Co-authored-by: Narekmat <47845266+Narekmat@users.noreply.github.com>
---
 charts/kafka-ui/Chart.yaml             | 2 +-
 charts/kafka-ui/templates/ingress.yaml | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
index db048a96..789021fb 100644
--- a/charts/kafka-ui/Chart.yaml
+++ b/charts/kafka-ui/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
-version: 0.7.2
+version: 0.7.3
 appVersion: v0.7.1
 icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png
diff --git a/charts/kafka-ui/templates/ingress.yaml b/charts/kafka-ui/templates/ingress.yaml
index 13e746d8..b8c629fd 100644
--- a/charts/kafka-ui/templates/ingress.yaml
+++ b/charts/kafka-ui/templates/ingress.yaml
@@ -35,12 +35,17 @@ spec:
 {{- if and ($.Capabilities.APIVersions.Has "networking.k8s.io/v1") $isHigher1p19 -}}
           {{- range .Values.ingress.precedingPaths }}
           - path: {{ .path }}
-            pathType: {{ .Values.ingress.pathType }}
+            pathType: {{ $.Values.ingress.pathType }}
             backend:
               service:
                 name: {{ .serviceName }}
                 port:
+                  {{- if .servicePort }}
                   number: {{ .servicePort }}
+                  {{- end }}
+                  {{- if .servicePortName }}
+                  name: {{ .servicePortName }}
+                  {{- end }}
           {{- end }}
           - backend:
               service: