Skip to content

Commit 5b7e42f

Browse files
MichaelMcCoyTechMichaelMcCoyTech
authored
Merge pull request #27 from dnvgl/feature/virtualservice-regexmatches
Feature/virtualservice regexmatches
2 parents ae7909a + 77a55fc commit 5b7e42f

24 files changed

+171
-65
lines changed

‎charts/platform-service/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ apiVersion: v1
22
appVersion: "1.1"
33
description: Platform service chart
44
name: platform-service
5-
version: 1.2.4
5+
version: 1.2.5

‎charts/platform-service/templates/virtualservice.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ spec:
5757
gateways:
5858
- {{ required "A valid .Values.gateway.name entry required!" .Values.gateway.name }}
5959
{{- $prefixes := default (list .Values.app) .Values.defaultRouting.urlPrefixes }}
60+
{{- $regexes := .Values.defaultRouting.urlRegexes }}
6061
http:
6162
{{- if .Values.defaultRouting.urlExactMatches }}
6263
- match:
@@ -110,6 +111,10 @@ spec:
110111
- uri:
111112
prefix: {{ $slashPrefix }}/
112113
{{- end }}
114+
{{- range $regexes }}
115+
- uri:
116+
regex: {{ . }}
117+
{{- end }}
113118
{{- end }}
114119
{{- if .Values.defaultRouting.rewriteUrlPrefix.enabled }}
115120
rewrite:

‎charts/platform-service/values.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ defaultRouting:
106106
# list of prefixes for route matching - overrides the default prefix (app)
107107
urlPrefixes:
108108

109+
# list of regexes for route matching
110+
urlRegexes:
111+
109112
# catch-all route - anything not routed elsewhere will be routed here
110113
# When this is used, urlPrefixes are ignored (there should be only catch-all route for this host & gateway)
111114
catchAll: false

‎testing/generate-results.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ helm template test-release ../charts/platform-service -n test-ns -f values.yaml
6868
--show-only templates/virtualservice.yaml \
6969
> results/vs-exact-matches.yaml
7070

71+
helm template test-release ../charts/platform-service -n test-ns -f values.yaml \
72+
--set defaultRouting.urlRegexes[0]="/api/.*" \
73+
--show-only templates/virtualservice.yaml \
74+
> results/vs-regexPrefixes.yaml
75+
7176
helm template test-release ../charts/platform-service -n test-ns -f values.yaml \
7277
--set opa.enabled=true \
7378
--show-only templates/deployment.yaml \

‎testing/results/base-case.yaml‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
app: test
99
app.kubernetes.io/name: test
10-
helm.sh/chart: platform-service-1.1.2
10+
helm.sh/chart: platform-service-1.2.4
1111
app.kubernetes.io/instance: test-release
1212
version: v1
1313
state: stateful
@@ -49,10 +49,11 @@ metadata:
4949
labels:
5050
app: test
5151
app.kubernetes.io/name: test
52-
helm.sh/chart: platform-service-1.1.2
52+
helm.sh/chart: platform-service-1.2.4
5353
app.kubernetes.io/instance: test-release
5454
version: v1
55-
state: stateful
55+
state: stateful
56+
automountServiceAccountToken: false
5657
---
5758
# Source: platform-service/templates/service.yaml
5859
apiVersion: v1
@@ -62,7 +63,7 @@ metadata:
6263
labels:
6364
app: test
6465
app.kubernetes.io/name: test
65-
helm.sh/chart: platform-service-1.1.2
66+
helm.sh/chart: platform-service-1.2.4
6667
app.kubernetes.io/instance: test-release
6768
version: v1
6869
state: stateful
@@ -85,7 +86,7 @@ metadata:
8586
labels:
8687
app: test
8788
app.kubernetes.io/name: test
88-
helm.sh/chart: platform-service-1.1.2
89+
helm.sh/chart: platform-service-1.2.4
8990
app.kubernetes.io/instance: test-release
9091
version: v1
9192
state: stateful
@@ -100,7 +101,7 @@ spec:
100101
labels:
101102
app: test
102103
app.kubernetes.io/name: test
103-
helm.sh/chart: platform-service-1.1.2
104+
helm.sh/chart: platform-service-1.2.4
104105
app.kubernetes.io/instance: test-release
105106
version: v1
106107
state: stateful
@@ -166,6 +167,8 @@ spec:
166167

167168
resources:
168169
{}
170+
terminationGracePeriodSeconds:
171+
30
169172
volumes:
170173

171174
- name: service-secrets
@@ -180,7 +183,7 @@ metadata:
180183
labels:
181184
app: test
182185
app.kubernetes.io/name: test
183-
helm.sh/chart: platform-service-1.1.2
186+
helm.sh/chart: platform-service-1.2.4
184187
app.kubernetes.io/instance: test-release
185188
version: v1
186189
state: stateful
@@ -211,7 +214,7 @@ metadata:
211214
labels:
212215
app: test
213216
app.kubernetes.io/name: test
214-
helm.sh/chart: platform-service-1.1.2
217+
helm.sh/chart: platform-service-1.2.4
215218
app.kubernetes.io/instance: test-release
216219
version: v1
217220
state: stateful
@@ -231,7 +234,7 @@ metadata:
231234
labels:
232235
app: test
233236
app.kubernetes.io/name: test
234-
helm.sh/chart: platform-service-1.1.2
237+
helm.sh/chart: platform-service-1.2.4
235238
app.kubernetes.io/instance: test-release
236239
version: v1
237240
state: stateful
@@ -270,7 +273,7 @@ metadata:
270273
labels:
271274
app: test
272275
app.kubernetes.io/name: test
273-
helm.sh/chart: platform-service-1.1.2
276+
helm.sh/chart: platform-service-1.2.4
274277
app.kubernetes.io/instance: test-release
275278
version: v1
276279
state: stateful

‎testing/results/default-image-automation.yaml‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
app: test
99
app.kubernetes.io/name: test
10-
helm.sh/chart: platform-service-1.1.2
10+
helm.sh/chart: platform-service-1.2.4
1111
app.kubernetes.io/instance: test-release
1212
version: v1
1313
state: stateful
@@ -49,10 +49,11 @@ metadata:
4949
labels:
5050
app: test
5151
app.kubernetes.io/name: test
52-
helm.sh/chart: platform-service-1.1.2
52+
helm.sh/chart: platform-service-1.2.4
5353
app.kubernetes.io/instance: test-release
5454
version: v1
55-
state: stateful
55+
state: stateful
56+
automountServiceAccountToken: false
5657
---
5758
# Source: platform-service/templates/service.yaml
5859
apiVersion: v1
@@ -62,7 +63,7 @@ metadata:
6263
labels:
6364
app: test
6465
app.kubernetes.io/name: test
65-
helm.sh/chart: platform-service-1.1.2
66+
helm.sh/chart: platform-service-1.2.4
6667
app.kubernetes.io/instance: test-release
6768
version: v1
6869
state: stateful
@@ -85,7 +86,7 @@ metadata:
8586
labels:
8687
app: test
8788
app.kubernetes.io/name: test
88-
helm.sh/chart: platform-service-1.1.2
89+
helm.sh/chart: platform-service-1.2.4
8990
app.kubernetes.io/instance: test-release
9091
version: v1
9192
state: stateful
@@ -100,7 +101,7 @@ spec:
100101
labels:
101102
app: test
102103
app.kubernetes.io/name: test
103-
helm.sh/chart: platform-service-1.1.2
104+
helm.sh/chart: platform-service-1.2.4
104105
app.kubernetes.io/instance: test-release
105106
version: v1
106107
state: stateful
@@ -166,6 +167,8 @@ spec:
166167

167168
resources:
168169
{}
170+
terminationGracePeriodSeconds:
171+
30
169172
volumes:
170173

171174
- name: service-secrets
@@ -180,7 +183,7 @@ metadata:
180183
labels:
181184
app: test
182185
app.kubernetes.io/name: test
183-
helm.sh/chart: platform-service-1.1.2
186+
helm.sh/chart: platform-service-1.2.4
184187
app.kubernetes.io/instance: test-release
185188
version: v1
186189
state: stateful
@@ -211,7 +214,7 @@ metadata:
211214
labels:
212215
app: test
213216
app.kubernetes.io/name: test
214-
helm.sh/chart: platform-service-1.1.2
217+
helm.sh/chart: platform-service-1.2.4
215218
app.kubernetes.io/instance: test-release
216219
version: v1
217220
state: stateful
@@ -231,7 +234,7 @@ metadata:
231234
spec:
232235
imageRepositoryRef:
233236
name: test
234-
policy:
237+
policy:
235238
numerical:
236239
order: asc
237240
---
@@ -252,7 +255,7 @@ metadata:
252255
labels:
253256
app: test
254257
app.kubernetes.io/name: test
255-
helm.sh/chart: platform-service-1.1.2
258+
helm.sh/chart: platform-service-1.2.4
256259
app.kubernetes.io/instance: test-release
257260
version: v1
258261
state: stateful
@@ -291,7 +294,7 @@ metadata:
291294
labels:
292295
app: test
293296
app.kubernetes.io/name: test
294-
helm.sh/chart: platform-service-1.1.2
297+
helm.sh/chart: platform-service-1.2.4
295298
app.kubernetes.io/instance: test-release
296299
version: v1
297300
state: stateful

‎testing/results/deployment-only.yaml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
app: test
99
app.kubernetes.io/name: test
10-
helm.sh/chart: platform-service-1.1.2
10+
helm.sh/chart: platform-service-1.2.4
1111
app.kubernetes.io/instance: test-release
1212
version: v1
1313
state: stateful
@@ -49,7 +49,7 @@ metadata:
4949
labels:
5050
app: test
5151
app.kubernetes.io/name: test
52-
helm.sh/chart: platform-service-1.1.2
52+
helm.sh/chart: platform-service-1.2.4
5353
app.kubernetes.io/instance: test-release
5454
version: v1
5555
state: stateful
@@ -64,7 +64,7 @@ spec:
6464
labels:
6565
app: test
6666
app.kubernetes.io/name: test
67-
helm.sh/chart: platform-service-1.1.2
67+
helm.sh/chart: platform-service-1.2.4
6868
app.kubernetes.io/instance: test-release
6969
version: v1
7070
state: stateful
@@ -130,12 +130,17 @@ spec:
130130

131131
resources:
132132
{}
133+
terminationGracePeriodSeconds:
134+
30
133135
volumes:
134136

135137
- name: service-secrets
136138
secret:
137139
secretName: test-secrets
138140
---
141+
# Source: platform-service/templates/service-account.yaml
142+
automountServiceAccountToken: false
143+
---
139144
# Source: platform-service/templates/authorizationPolicy.yaml
140145
apiVersion: security.istio.io/v1beta1
141146
kind: AuthorizationPolicy
@@ -144,7 +149,7 @@ metadata:
144149
labels:
145150
app: test
146151
app.kubernetes.io/name: test
147-
helm.sh/chart: platform-service-1.1.2
152+
helm.sh/chart: platform-service-1.2.4
148153
app.kubernetes.io/instance: test-release
149154
version: v1
150155
state: stateful
@@ -175,7 +180,7 @@ metadata:
175180
labels:
176181
app: test
177182
app.kubernetes.io/name: test
178-
helm.sh/chart: platform-service-1.1.2
183+
helm.sh/chart: platform-service-1.2.4
179184
app.kubernetes.io/instance: test-release
180185
version: v1
181186
state: stateful
@@ -195,7 +200,7 @@ metadata:
195200
labels:
196201
app: test
197202
app.kubernetes.io/name: test
198-
helm.sh/chart: platform-service-1.1.2
203+
helm.sh/chart: platform-service-1.2.4
199204
app.kubernetes.io/instance: test-release
200205
version: v1
201206
state: stateful

‎testing/results/full-image-syntax.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
app: test
99
app.kubernetes.io/name: test
10-
helm.sh/chart: platform-service-1.1.2
10+
helm.sh/chart: platform-service-1.2.4
1111
app.kubernetes.io/instance: test-release
1212
version: v1
1313
state: stateful
@@ -22,7 +22,7 @@ spec:
2222
labels:
2323
app: test
2424
app.kubernetes.io/name: test
25-
helm.sh/chart: platform-service-1.1.2
25+
helm.sh/chart: platform-service-1.2.4
2626
app.kubernetes.io/instance: test-release
2727
version: v1
2828
state: stateful
@@ -88,6 +88,8 @@ spec:
8888

8989
resources:
9090
{}
91+
terminationGracePeriodSeconds:
92+
30
9193
volumes:
9294

9395
- name: service-secrets

‎testing/results/mergeAppMetrics.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
app: test
99
app.kubernetes.io/name: test
10-
helm.sh/chart: platform-service-1.1.2
10+
helm.sh/chart: platform-service-1.2.4
1111
app.kubernetes.io/instance: test-release
1212
version: v1
1313
state: stateful
@@ -22,7 +22,7 @@ spec:
2222
labels:
2323
app: test
2424
app.kubernetes.io/name: test
25-
helm.sh/chart: platform-service-1.1.2
25+
helm.sh/chart: platform-service-1.2.4
2626
app.kubernetes.io/instance: test-release
2727
version: v1
2828
state: stateful
@@ -89,6 +89,8 @@ spec:
8989

9090
resources:
9191
{}
92+
terminationGracePeriodSeconds:
93+
30
9294
volumes:
9395

9496
- name: service-secrets

‎testing/results/no-sessman.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
app: test
99
app.kubernetes.io/name: test
10-
helm.sh/chart: platform-service-1.1.2
10+
helm.sh/chart: platform-service-1.2.4
1111
app.kubernetes.io/instance: test-release
1212
version: v1
1313
state: stateful
@@ -22,7 +22,7 @@ spec:
2222
labels:
2323
app: test
2424
app.kubernetes.io/name: test
25-
helm.sh/chart: platform-service-1.1.2
25+
helm.sh/chart: platform-service-1.2.4
2626
app.kubernetes.io/instance: test-release
2727
version: v1
2828
state: stateful
@@ -87,6 +87,8 @@ spec:
8787

8888
resources:
8989
{}
90+
terminationGracePeriodSeconds:
91+
30
9092
volumes:
9193

9294
- name: service-secrets

0 commit comments

Comments
 (0)