removing trailing hypen

energywebfoundation · Oct 19, 2023 · 6c4562a · 6c4562a
1 parent 5dd3625
commit 6c4562a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/templates/ingress.yaml b/templates/ingress.yaml
@@ -50,15 +50,15 @@ spec:
             backend:
               {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
-                name: {{ if $.Values.ingress.multipleServices }}{{ $fullName }}-{{ .path | trimPrefix "/" | replace "/" "-" | lower | trimSuffix "-" | trimPrefix "-" }}{{ else }}{{ $fullName }}{{ end }}
+                name: {{ if $.Values.ingress.multipleServices }}{{ $fullName }}{{ .path | trimPrefix "/" | replace "/" "-" | lower | trimSuffix "-" | trimPrefix "-" }}{{ else }}{{ $fullName }}{{ end }}
                 port:
                   {{- if $servicePortName }}
                   name: {{ $servicePortName }}
                   {{- else }}
                   number: {{ (index $svcPort 0).port }}
                   {{- end }}                  
               {{- else }}
-              serviceName: {{ if $.Values.ingress.multipleServices }}{{ $fullName }}-{{ .path | trimPrefix "/" | replace "/" "-" | lower | trimSuffix "-" | trimPrefix "-" }}{{ else }}{{ $fullName }}{{ end }}
+              serviceName: {{ if $.Values.ingress.multipleServices }}{{ $fullName }}{{ .path | trimPrefix "/" | replace "/" "-" | lower | trimSuffix "-" | trimPrefix "-" }}{{ else }}{{ $fullName }}{{ end }}
               servicePort: {{ (index $svcPort 0).port }}
               {{- end }}
           {{- end }}

diff --git a/templates/service.yaml b/templates/service.yaml
@@ -6,7 +6,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "microservice.fullname" $ }}-{{ .path | trimPrefix "/" | replace "/" "-" | lower | trimSuffix "-" | trimPrefix "-" }}
+  name: {{ include "microservice.fullname" $ }}{{ .path | trimPrefix "/" | replace "/" "-" | lower | trimSuffix "-" | trimPrefix "-" }}
   labels:
     {{- include "microservice.labels" $ | nindent 4 }}
 spec: