allow configuring port name

energywebfoundation · Oct 11, 2023 · c69ead0 · c69ead0
1 parent 1ce8151
commit c69ead0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/templates/ingress.yaml b/templates/ingress.yaml
@@ -1,6 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "microservice.fullname" . -}}
 {{- $svcPort := .Values.service.ports -}}
+{{- $servicePortName := .Values.ingress.servicePortName -}}
 {{- 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}}
@@ -49,15 +50,18 @@ spec:
             backend:
               {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
-                name: {{ .pathServiceName | default $fullName }}
               {{- range $key, $value := $svcPort }}
+                name: {{ $fullName }}
                 port:
                   number: {{ .port }}
+                  {{- if $servicePortName }}
+                  name: {{ $servicePortName}}
+                  {{- end }}                  
               {{- else }}
-              serviceName: {{ .pathServiceName | default $fullName }}
+              serviceName: {{ $fullName }}
               servicePort: {{ .port }}
               {{- end }}
               {{- end }}
           {{- end }}
     {{- end }}
-{{- end }}
+{{- end }}
diff --git a/values.yaml b/values.yaml
@@ -98,6 +98,7 @@ service:
 ingress:
   enabled: false
   className: ""
+  servicePortName: ""
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
@@ -106,7 +107,6 @@ ingress:
       paths:
         - path: /
           pathType: ImplementationSpecific
-          pathServiceName: ""
   tls: []
   #  - secretName: chart-example-tls
   #    hosts: