From 39c20658c8199119009ae9d533d78cf41a307da2 Mon Sep 17 00:00:00 2001
From: "Zhidong.Chen" <zhidchen@tesla.com>
Date: Fri, 13 Aug 2021 01:01:17 +0800
Subject: [PATCH] fix common ingress template

---
 charts/common/templates/classes/_ingress.tpl | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/charts/common/templates/classes/_ingress.tpl b/charts/common/templates/classes/_ingress.tpl
index 28b67f93..c931adaa 100644
--- a/charts/common/templates/classes/_ingress.tpl
+++ b/charts/common/templates/classes/_ingress.tpl
@@ -14,8 +14,6 @@ within the common library.
 {{- if hasKey $values "nameSuffix" -}}
   {{- $ingressName = printf "%v-%v" $ingressName $values.nameSuffix -}}
 {{ end -}}
-{{- $svcName := $values.serviceName | default (include "common.names.fullname" .) -}}
-{{- $svcPort := $values.servicePort | default $.Values.service.port.port -}}
 apiVersion: {{ include "common.capabilities.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
@@ -47,13 +45,13 @@ spec:
             pathType: {{ .pathType }}
             backend:
               {{- if ne $version "networking.k8s.io/v1" }}
-              serviceName: {{ $svcName }}
-              servicePort: {{ $svcPort }}
+              serviceName: {{ .backend.serviceName }}
+              servicePort: {{ .backend.servicePort }}
               {{- else }}
               service:
-                name: {{ $svcName }}
+                name: {{ .backend.serviceName }}
                 port:
-                  number: {{ $svcPort }}
+                  number: {{ .backend.servicePort  }}
               {{- end }}
           {{- end }}
   {{- end }}