Fixed #2084: Helm generates trailing slash in serviceRootUrl

FraunhoferIOSB · Jan 7, 2025 · 18513c7 · 18513c7
1 parent f8a7124
commit 18513c7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/...rver.Core.Model/src/main/java/de/fraunhofer/iosb/ilt/frostserver/query/QueryDefaults.java b/...rver.Core.Model/src/main/java/de/fraunhofer/iosb/ilt/frostserver/query/QueryDefaults.java
@@ -17,6 +17,8 @@
  */
 package de.fraunhofer.iosb.ilt.frostserver.query;
 
+import org.apache.commons.lang3.StringUtils;
+
 /**
  * Class holding default values for queries.
  */
@@ -69,7 +71,7 @@ public QueryDefaults(boolean absNavLinks, boolean countDefault, int topDefault,
      * @return this.
      */
     public final QueryDefaults setServiceRootUrl(String serviceRootUrl) {
-        this.serviceRootUrl = serviceRootUrl;
+        this.serviceRootUrl = StringUtils.removeEnd(serviceRootUrl, "/");
         return this;
     }
 

diff --git a/helm/frost-server/templates/_helpers.tpl b/helm/frost-server/templates/_helpers.tpl
@@ -52,9 +52,9 @@ Get the HTTP service SubPath
 */}}
 {{- define "frost-server.http.serviceSubPath" -}}
   {{- if not .Values.frost.http.urlSubPath | empty -}}
-      {{- printf "/%s/" .Values.frost.http.urlSubPath | replace "//" "/" -}}
+      {{- printf "/%s" .Values.frost.http.urlSubPath | replace "//" "/" -}}
   {{- else -}}
-      {{- printf "/" -}}
+      {{- printf "" -}}
   {{- end -}}
 {{- end -}}
 

diff --git a/helm/frost-server/templates/http-ingress.yaml b/helm/frost-server/templates/http-ingress.yaml
@@ -42,7 +42,7 @@ spec:
   - host: {{ include "frost-server.http.serviceHost" . }}
     http:
       paths:
-      - path:  {{ template "frost-server.http.serviceSubPath" . }}
+      - path:  {{ template "frost-server.http.serviceSubPath" . }}/
         pathType: Prefix
         backend:
           service: