Merge pull request #120 from MediaMarktSaturn/application-configurabl…

…e-httproute-rewrite [Application] Make url rewrite with gateway api configurable
MediaMarktSaturn · Jun 12, 2024 · 12da20b · 12da20b
2 parents 04b263a + 7e746e2
commit 12da20b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/chart-tests/application/ci/test-gateway-api-values.yaml b/chart-tests/application/ci/test-gateway-api-values.yaml
@@ -9,7 +9,6 @@ resources:
 gatewayApi:
   enabled: true
   pathPrefix: /examine
-  stripPathPrefix: true
   gatewayRef:
     name: http-gateway
     namespace: default
diff --git a/charts/application/Chart.yaml b/charts/application/Chart.yaml
@@ -7,4 +7,4 @@ maintainers:
   - name: MediaMarktSaturn
     url: https://github.com/MediaMarktSaturn
 appVersion: 1.0.0
-version: 1.14.2
+version: 1.15.0
diff --git a/charts/application/templates/flagger-canary.yaml b/charts/application/templates/flagger-canary.yaml
@@ -64,9 +64,10 @@ spec:
     match:
       - uri:
           prefix: {{ .Values.gatewayApi.pathPrefix | quote }}
-    {{- if .Values.gatewayApi.stripPathPrefix }}
+    {{- if .Values.gatewayApi.pathPrefixRewrite }}
     rewrite:
-      uri: /
+      uri: {{ .Values.gatewayApi.pathPrefixRewrite | quote }}
+      type: ReplacePrefixMatch
     {{- end }}
     {{- end }}
     gatewayRefs:

diff --git a/charts/application/templates/k8s-http-route.yaml b/charts/application/templates/k8s-http-route.yaml
@@ -33,13 +33,13 @@ spec:
       - path:
           type: PathPrefix
           value: {{ .Values.gatewayApi.pathPrefix | quote }}
-      {{- if .Values.gatewayApi.stripPathPrefix }}
+      {{- if .Values.gatewayApi.pathPrefixRewrite }}
       filters:
         - type: URLRewrite
           urlRewrite:
             path:
-              replaceFullPath: /
-              type: ReplaceFullPath
+              replacePrefixMatch: {{ .Values.gatewayApi.pathPrefixRewrite | quote }}
+              type: ReplacePrefixMatch
       {{- end }}
       {{- end }}
 {{- end }}
diff --git a/charts/application/values.yaml b/charts/application/values.yaml
@@ -168,8 +168,10 @@ linkerd:
 gatewayApi:
   enabled: false
   host:
+  # optional first url part to match this services http route
   pathPrefix:
-  stripPathPrefix: false
+  # optionally rewrite (or remove) the matched url prefix
+  pathPrefixRewrite: /
   gatewayRef:
     name:
     namespace: