Merge pull request #27 from dnvgl/feature/virtualservice-regexmatches

Feature/virtualservice regexmatches
dnvgl · Feb 19, 2024 · 5b7e42f · 5b7e42f
2 parents ae7909a + 77a55fc
commit 5b7e42f
Show file tree

Hide file tree

Showing 24 changed files with 171 additions and 65 deletions.
diff --git a/charts/platform-service/Chart.yaml b/charts/platform-service/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.1"
 description: Platform service chart
 name: platform-service
-version: 1.2.4
+version: 1.2.5
diff --git a/charts/platform-service/templates/virtualservice.yaml b/charts/platform-service/templates/virtualservice.yaml
@@ -57,6 +57,7 @@ spec:
   gateways:
     - {{ required "A valid .Values.gateway.name entry required!" .Values.gateway.name }}
 {{- $prefixes := default (list .Values.app) .Values.defaultRouting.urlPrefixes }}
+{{- $regexes := .Values.defaultRouting.urlRegexes }}
   http:
 {{- if .Values.defaultRouting.urlExactMatches }}
   - match:
@@ -110,6 +111,10 @@ spec:
     - uri:
         prefix: {{ $slashPrefix }}/
     {{- end }}
+    {{- range $regexes }}
+    - uri:
+        regex: {{ . }}
+    {{- end }}
   {{- end }}
 {{- if .Values.defaultRouting.rewriteUrlPrefix.enabled }}
     rewrite:

diff --git a/charts/platform-service/values.yaml b/charts/platform-service/values.yaml
@@ -106,6 +106,9 @@ defaultRouting:
   # list of prefixes for route matching - overrides the default prefix (app)
   urlPrefixes:
 
+   # list of regexes for route matching
+  urlRegexes:
+
   # catch-all route - anything not routed elsewhere will be routed here
   # When this is used, urlPrefixes are ignored (there should be only catch-all route for this host & gateway)
   catchAll: false

diff --git a/testing/generate-results.sh b/testing/generate-results.sh
@@ -68,6 +68,11 @@ helm template test-release ../charts/platform-service -n test-ns -f values.yaml
     --show-only templates/virtualservice.yaml \
     > results/vs-exact-matches.yaml
 
+helm template test-release ../charts/platform-service -n test-ns -f values.yaml \
+    --set defaultRouting.urlRegexes[0]="/api/.*" \
+    --show-only templates/virtualservice.yaml \
+    > results/vs-regexPrefixes.yaml
+
 helm template test-release ../charts/platform-service -n test-ns -f values.yaml \
     --set opa.enabled=true \
     --show-only templates/deployment.yaml \

diff --git a/testing/results/base-case.yaml b/testing/results/base-case.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
     state: stateful
@@ -49,10 +49,11 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
-    state: stateful
+    state: stateful
+automountServiceAccountToken: false
 ---
 # Source: platform-service/templates/service.yaml
 apiVersion: v1
@@ -62,7 +63,7 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
     state: stateful
@@ -85,7 +86,7 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
     state: stateful
@@ -100,7 +101,7 @@ spec:
       labels:
         app: test
         app.kubernetes.io/name: test
-        helm.sh/chart: platform-service-1.1.2
+        helm.sh/chart: platform-service-1.2.4
         app.kubernetes.io/instance: test-release
         version: v1
         state: stateful
@@ -166,6 +167,8 @@ spec:
 
           resources:
             {}
+          terminationGracePeriodSeconds:
+            30
       volumes:
 
       - name: service-secrets
@@ -180,7 +183,7 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
     state: stateful
@@ -211,7 +214,7 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
     state: stateful
@@ -231,7 +234,7 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
     state: stateful
@@ -270,7 +273,7 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
     state: stateful

diff --git a/testing/results/default-image-automation.yaml b/testing/results/default-image-automation.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
     state: stateful
@@ -49,10 +49,11 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
-    state: stateful
+    state: stateful
+automountServiceAccountToken: false
 ---
 # Source: platform-service/templates/service.yaml
 apiVersion: v1
@@ -62,7 +63,7 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
     state: stateful
@@ -85,7 +86,7 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
     state: stateful
@@ -100,7 +101,7 @@ spec:
       labels:
         app: test
         app.kubernetes.io/name: test
-        helm.sh/chart: platform-service-1.1.2
+        helm.sh/chart: platform-service-1.2.4
         app.kubernetes.io/instance: test-release
         version: v1
         state: stateful
@@ -166,6 +167,8 @@ spec:
 
           resources:
             {}
+          terminationGracePeriodSeconds:
+            30
       volumes:
 
       - name: service-secrets
@@ -180,7 +183,7 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
     state: stateful
@@ -211,7 +214,7 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
     state: stateful
@@ -231,7 +234,7 @@ metadata:
 spec:
   imageRepositoryRef:
     name: test
-  policy: 
+  policy:
     numerical:
       order: asc
 ---
@@ -252,7 +255,7 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
     state: stateful
@@ -291,7 +294,7 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
     state: stateful

diff --git a/testing/results/deployment-only.yaml b/testing/results/deployment-only.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
     state: stateful
@@ -49,7 +49,7 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
     state: stateful
@@ -64,7 +64,7 @@ spec:
       labels:
         app: test
         app.kubernetes.io/name: test
-        helm.sh/chart: platform-service-1.1.2
+        helm.sh/chart: platform-service-1.2.4
         app.kubernetes.io/instance: test-release
         version: v1
         state: stateful
@@ -130,12 +130,17 @@ spec:
 
           resources:
             {}
+          terminationGracePeriodSeconds:
+            30
       volumes:
 
       - name: service-secrets
         secret:
           secretName: test-secrets
 ---
+# Source: platform-service/templates/service-account.yaml
+automountServiceAccountToken: false
+---
 # Source: platform-service/templates/authorizationPolicy.yaml
 apiVersion: security.istio.io/v1beta1
 kind: AuthorizationPolicy
@@ -144,7 +149,7 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
     state: stateful
@@ -175,7 +180,7 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
     state: stateful
@@ -195,7 +200,7 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
     state: stateful

diff --git a/testing/results/full-image-syntax.yaml b/testing/results/full-image-syntax.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
     state: stateful
@@ -22,7 +22,7 @@ spec:
       labels:
         app: test
         app.kubernetes.io/name: test
-        helm.sh/chart: platform-service-1.1.2
+        helm.sh/chart: platform-service-1.2.4
         app.kubernetes.io/instance: test-release
         version: v1
         state: stateful
@@ -88,6 +88,8 @@ spec:
 
           resources:
             {}
+          terminationGracePeriodSeconds:
+            30
       volumes:
 
       - name: service-secrets

diff --git a/testing/results/mergeAppMetrics.yaml b/testing/results/mergeAppMetrics.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
     state: stateful
@@ -22,7 +22,7 @@ spec:
       labels:
         app: test
         app.kubernetes.io/name: test
-        helm.sh/chart: platform-service-1.1.2
+        helm.sh/chart: platform-service-1.2.4
         app.kubernetes.io/instance: test-release
         version: v1
         state: stateful
@@ -89,6 +89,8 @@ spec:
 
           resources:
             {}
+          terminationGracePeriodSeconds:
+            30
       volumes:
 
       - name: service-secrets

diff --git a/testing/results/no-sessman.yaml b/testing/results/no-sessman.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: test
     app.kubernetes.io/name: test
-    helm.sh/chart: platform-service-1.1.2
+    helm.sh/chart: platform-service-1.2.4
     app.kubernetes.io/instance: test-release
     version: v1
     state: stateful
@@ -22,7 +22,7 @@ spec:
       labels:
         app: test
         app.kubernetes.io/name: test
-        helm.sh/chart: platform-service-1.1.2
+        helm.sh/chart: platform-service-1.2.4
         app.kubernetes.io/instance: test-release
         version: v1
         state: stateful
@@ -87,6 +87,8 @@ spec:
 
           resources:
             {}
+          terminationGracePeriodSeconds:
+            30
       volumes:
 
       - name: service-secrets