Skip to content

Commit db1c3ce

Browse files
zirainzirain
authored
bump Gateway API to v1.5.1 (#8533)
* bump Gateway API Signed-off-by: zirain <zirain2009@gmail.com> * fix gen Signed-off-by: zirain <zirain2009@gmail.com> --------- Signed-off-by: zirain <zirain2009@gmail.com>
1 parent 7ce7259 commit db1c3ce

15 files changed

Lines changed: 161 additions & 97 deletions

File tree

‎charts/gateway-crds-helm/templates/experimental-gatewayapi-crds.yaml‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ kind: CustomResourceDefinition
2525
metadata:
2626
annotations:
2727
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
28-
gateway.networking.k8s.io/bundle-version: v1.5.0
28+
gateway.networking.k8s.io/bundle-version: v1.5.1
2929
gateway.networking.k8s.io/channel: experimental
3030
labels:
3131
gateway.networking.k8s.io/policy: Direct
@@ -1447,7 +1447,7 @@ kind: CustomResourceDefinition
14471447
metadata:
14481448
annotations:
14491449
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
1450-
gateway.networking.k8s.io/bundle-version: v1.5.0
1450+
gateway.networking.k8s.io/bundle-version: v1.5.1
14511451
gateway.networking.k8s.io/channel: experimental
14521452
name: gatewayclasses.gateway.networking.k8s.io
14531453
spec:
@@ -1966,7 +1966,7 @@ kind: CustomResourceDefinition
19661966
metadata:
19671967
annotations:
19681968
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
1969-
gateway.networking.k8s.io/bundle-version: v1.5.0
1969+
gateway.networking.k8s.io/bundle-version: v1.5.1
19701970
gateway.networking.k8s.io/channel: experimental
19711971
name: gateways.gateway.networking.k8s.io
19721972
spec:
@@ -5299,7 +5299,7 @@ kind: CustomResourceDefinition
52995299
metadata:
53005300
annotations:
53015301
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
5302-
gateway.networking.k8s.io/bundle-version: v1.5.0
5302+
gateway.networking.k8s.io/bundle-version: v1.5.1
53035303
gateway.networking.k8s.io/channel: experimental
53045304
name: grpcroutes.gateway.networking.k8s.io
53055305
spec:
@@ -7582,7 +7582,7 @@ kind: CustomResourceDefinition
75827582
metadata:
75837583
annotations:
75847584
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
7585-
gateway.networking.k8s.io/bundle-version: v1.5.0
7585+
gateway.networking.k8s.io/bundle-version: v1.5.1
75867586
gateway.networking.k8s.io/channel: experimental
75877587
name: httproutes.gateway.networking.k8s.io
75887588
spec:
@@ -9415,6 +9415,8 @@ spec:
94159415
or httpRouteFilterRequestRewrite, but not both
94169416
rule: '!(self.exists(f, f.type == ''RequestRedirect'')
94179417
&& self.exists(f, f.type == ''URLRewrite''))'
9418+
- message: CORS filter cannot be repeated
9419+
rule: self.filter(f, f.type == 'CORS').size() <= 1
94189420
- message: RequestHeaderModifier filter cannot be repeated
94199421
rule: self.filter(f, f.type == 'RequestHeaderModifier').size()
94209422
<= 1
@@ -10934,6 +10936,8 @@ spec:
1093410936
or httpRouteFilterRequestRewrite, but not both
1093510937
rule: '!(self.exists(f, f.type == ''RequestRedirect'') &&
1093610938
self.exists(f, f.type == ''URLRewrite''))'
10939+
- message: CORS filter cannot be repeated
10940+
rule: self.filter(f, f.type == 'CORS').size() <= 1
1093710941
- message: RequestHeaderModifier filter cannot be repeated
1093810942
rule: self.filter(f, f.type == 'RequestHeaderModifier').size()
1093910943
<= 1
@@ -13676,6 +13680,8 @@ spec:
1367613680
or httpRouteFilterRequestRewrite, but not both
1367713681
rule: '!(self.exists(f, f.type == ''RequestRedirect'')
1367813682
&& self.exists(f, f.type == ''URLRewrite''))'
13683+
- message: CORS filter cannot be repeated
13684+
rule: self.filter(f, f.type == 'CORS').size() <= 1
1367913685
- message: RequestHeaderModifier filter cannot be repeated
1368013686
rule: self.filter(f, f.type == 'RequestHeaderModifier').size()
1368113687
<= 1
@@ -15195,6 +15201,8 @@ spec:
1519515201
or httpRouteFilterRequestRewrite, but not both
1519615202
rule: '!(self.exists(f, f.type == ''RequestRedirect'') &&
1519715203
self.exists(f, f.type == ''URLRewrite''))'
15204+
- message: CORS filter cannot be repeated
15205+
rule: self.filter(f, f.type == 'CORS').size() <= 1
1519815206
- message: RequestHeaderModifier filter cannot be repeated
1519915207
rule: self.filter(f, f.type == 'RequestHeaderModifier').size()
1520015208
<= 1
@@ -16133,7 +16141,7 @@ kind: CustomResourceDefinition
1613316141
metadata:
1613416142
annotations:
1613516143
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
16136-
gateway.networking.k8s.io/bundle-version: v1.5.0
16144+
gateway.networking.k8s.io/bundle-version: v1.5.1
1613716145
gateway.networking.k8s.io/channel: experimental
1613816146
name: listenersets.gateway.networking.k8s.io
1613916147
spec:
@@ -16917,7 +16925,7 @@ kind: CustomResourceDefinition
1691716925
metadata:
1691816926
annotations:
1691916927
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
16920-
gateway.networking.k8s.io/bundle-version: v1.5.0
16928+
gateway.networking.k8s.io/bundle-version: v1.5.1
1692116929
gateway.networking.k8s.io/channel: experimental
1692216930
name: referencegrants.gateway.networking.k8s.io
1692316931
spec:
@@ -17274,7 +17282,7 @@ kind: CustomResourceDefinition
1727417282
metadata:
1727517283
annotations:
1727617284
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
17277-
gateway.networking.k8s.io/bundle-version: v1.5.0
17285+
gateway.networking.k8s.io/bundle-version: v1.5.1
1727817286
gateway.networking.k8s.io/channel: experimental
1727917287
name: tcproutes.gateway.networking.k8s.io
1728017288
spec:
@@ -18034,7 +18042,7 @@ kind: CustomResourceDefinition
1803418042
metadata:
1803518043
annotations:
1803618044
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
18037-
gateway.networking.k8s.io/bundle-version: v1.5.0
18045+
gateway.networking.k8s.io/bundle-version: v1.5.1
1803818046
gateway.networking.k8s.io/channel: experimental
1803918047
name: tlsroutes.gateway.networking.k8s.io
1804018048
spec:
@@ -20408,7 +20416,7 @@ kind: CustomResourceDefinition
2040820416
metadata:
2040920417
annotations:
2041020418
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
20411-
gateway.networking.k8s.io/bundle-version: v1.5.0
20419+
gateway.networking.k8s.io/bundle-version: v1.5.1
2041220420
gateway.networking.k8s.io/channel: experimental
2041320421
name: udproutes.gateway.networking.k8s.io
2041420422
spec:
@@ -21220,7 +21228,7 @@ kind: CustomResourceDefinition
2122021228
metadata:
2122121229
annotations:
2122221230
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
21223-
gateway.networking.k8s.io/bundle-version: v1.5.0
21231+
gateway.networking.k8s.io/bundle-version: v1.5.1
2122421232
gateway.networking.k8s.io/channel: experimental
2122521233
labels:
2122621234
gateway.networking.k8s.io/policy: Direct
@@ -21832,7 +21840,7 @@ kind: CustomResourceDefinition
2183221840
metadata:
2183321841
annotations:
2183421842
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
21835-
gateway.networking.k8s.io/bundle-version: v1.5.0
21843+
gateway.networking.k8s.io/bundle-version: v1.5.1
2183621844
gateway.networking.k8s.io/channel: experimental
2183721845
name: xmeshes.gateway.networking.x-k8s.io
2183821846
spec:

‎charts/gateway-crds-helm/templates/standard-gatewayapi-crds.yaml‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ kind: CustomResourceDefinition
2525
metadata:
2626
annotations:
2727
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
28-
gateway.networking.k8s.io/bundle-version: v1.5.0
28+
gateway.networking.k8s.io/bundle-version: v1.5.1
2929
gateway.networking.k8s.io/channel: standard
3030
labels:
3131
gateway.networking.k8s.io/policy: Direct
@@ -1411,7 +1411,7 @@ kind: CustomResourceDefinition
14111411
metadata:
14121412
annotations:
14131413
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
1414-
gateway.networking.k8s.io/bundle-version: v1.5.0
1414+
gateway.networking.k8s.io/bundle-version: v1.5.1
14151415
gateway.networking.k8s.io/channel: standard
14161416
name: gatewayclasses.gateway.networking.k8s.io
14171417
spec:
@@ -1930,7 +1930,7 @@ kind: CustomResourceDefinition
19301930
metadata:
19311931
annotations:
19321932
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
1933-
gateway.networking.k8s.io/bundle-version: v1.5.0
1933+
gateway.networking.k8s.io/bundle-version: v1.5.1
19341934
gateway.networking.k8s.io/channel: standard
19351935
name: gateways.gateway.networking.k8s.io
19361936
spec:
@@ -5217,7 +5217,7 @@ kind: CustomResourceDefinition
52175217
metadata:
52185218
annotations:
52195219
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
5220-
gateway.networking.k8s.io/bundle-version: v1.5.0
5220+
gateway.networking.k8s.io/bundle-version: v1.5.1
52215221
gateway.networking.k8s.io/channel: standard
52225222
name: grpcroutes.gateway.networking.k8s.io
52235223
spec:
@@ -7291,7 +7291,7 @@ kind: CustomResourceDefinition
72917291
metadata:
72927292
annotations:
72937293
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
7294-
gateway.networking.k8s.io/bundle-version: v1.5.0
7294+
gateway.networking.k8s.io/bundle-version: v1.5.1
72957295
gateway.networking.k8s.io/channel: standard
72967296
name: httproutes.gateway.networking.k8s.io
72977297
spec:
@@ -8804,6 +8804,8 @@ spec:
88048804
or httpRouteFilterRequestRewrite, but not both
88058805
rule: '!(self.exists(f, f.type == ''RequestRedirect'')
88068806
&& self.exists(f, f.type == ''URLRewrite''))'
8807+
- message: CORS filter cannot be repeated
8808+
rule: self.filter(f, f.type == 'CORS').size() <= 1
88078809
- message: RequestHeaderModifier filter cannot be repeated
88088810
rule: self.filter(f, f.type == 'RequestHeaderModifier').size()
88098811
<= 1
@@ -10052,6 +10054,8 @@ spec:
1005210054
or httpRouteFilterRequestRewrite, but not both
1005310055
rule: '!(self.exists(f, f.type == ''RequestRedirect'') &&
1005410056
self.exists(f, f.type == ''URLRewrite''))'
10057+
- message: CORS filter cannot be repeated
10058+
rule: self.filter(f, f.type == 'CORS').size() <= 1
1005510059
- message: RequestHeaderModifier filter cannot be repeated
1005610060
rule: self.filter(f, f.type == 'RequestHeaderModifier').size()
1005710061
<= 1
@@ -12252,6 +12256,8 @@ spec:
1225212256
or httpRouteFilterRequestRewrite, but not both
1225312257
rule: '!(self.exists(f, f.type == ''RequestRedirect'')
1225412258
&& self.exists(f, f.type == ''URLRewrite''))'
12259+
- message: CORS filter cannot be repeated
12260+
rule: self.filter(f, f.type == 'CORS').size() <= 1
1225512261
- message: RequestHeaderModifier filter cannot be repeated
1225612262
rule: self.filter(f, f.type == 'RequestHeaderModifier').size()
1225712263
<= 1
@@ -13500,6 +13506,8 @@ spec:
1350013506
or httpRouteFilterRequestRewrite, but not both
1350113507
rule: '!(self.exists(f, f.type == ''RequestRedirect'') &&
1350213508
self.exists(f, f.type == ''URLRewrite''))'
13509+
- message: CORS filter cannot be repeated
13510+
rule: self.filter(f, f.type == 'CORS').size() <= 1
1350313511
- message: RequestHeaderModifier filter cannot be repeated
1350413512
rule: self.filter(f, f.type == 'RequestHeaderModifier').size()
1350513513
<= 1
@@ -14216,7 +14224,7 @@ kind: CustomResourceDefinition
1421614224
metadata:
1421714225
annotations:
1421814226
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
14219-
gateway.networking.k8s.io/bundle-version: v1.5.0
14227+
gateway.networking.k8s.io/bundle-version: v1.5.1
1422014228
gateway.networking.k8s.io/channel: standard
1422114229
name: listenersets.gateway.networking.k8s.io
1422214230
spec:
@@ -15000,7 +15008,7 @@ kind: CustomResourceDefinition
1500015008
metadata:
1500115009
annotations:
1500215010
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
15003-
gateway.networking.k8s.io/bundle-version: v1.5.0
15011+
gateway.networking.k8s.io/bundle-version: v1.5.1
1500415012
gateway.networking.k8s.io/channel: standard
1500515013
name: referencegrants.gateway.networking.k8s.io
1500615014
spec:
@@ -15357,7 +15365,7 @@ kind: CustomResourceDefinition
1535715365
metadata:
1535815366
annotations:
1535915367
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
15360-
gateway.networking.k8s.io/bundle-version: v1.5.0
15368+
gateway.networking.k8s.io/bundle-version: v1.5.1
1536115369
gateway.networking.k8s.io/channel: standard
1536215370
name: tlsroutes.gateway.networking.k8s.io
1536315371
spec:

‎charts/gateway-helm/charts/crds/crds/gatewayapi-crds.yaml‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ kind: CustomResourceDefinition
2424
metadata:
2525
annotations:
2626
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
27-
gateway.networking.k8s.io/bundle-version: v1.5.0
27+
gateway.networking.k8s.io/bundle-version: v1.5.1
2828
gateway.networking.k8s.io/channel: experimental
2929
labels:
3030
gateway.networking.k8s.io/policy: Direct
@@ -1446,7 +1446,7 @@ kind: CustomResourceDefinition
14461446
metadata:
14471447
annotations:
14481448
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
1449-
gateway.networking.k8s.io/bundle-version: v1.5.0
1449+
gateway.networking.k8s.io/bundle-version: v1.5.1
14501450
gateway.networking.k8s.io/channel: experimental
14511451
name: gatewayclasses.gateway.networking.k8s.io
14521452
spec:
@@ -1965,7 +1965,7 @@ kind: CustomResourceDefinition
19651965
metadata:
19661966
annotations:
19671967
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
1968-
gateway.networking.k8s.io/bundle-version: v1.5.0
1968+
gateway.networking.k8s.io/bundle-version: v1.5.1
19691969
gateway.networking.k8s.io/channel: experimental
19701970
name: gateways.gateway.networking.k8s.io
19711971
spec:
@@ -5298,7 +5298,7 @@ kind: CustomResourceDefinition
52985298
metadata:
52995299
annotations:
53005300
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
5301-
gateway.networking.k8s.io/bundle-version: v1.5.0
5301+
gateway.networking.k8s.io/bundle-version: v1.5.1
53025302
gateway.networking.k8s.io/channel: experimental
53035303
name: grpcroutes.gateway.networking.k8s.io
53045304
spec:
@@ -7581,7 +7581,7 @@ kind: CustomResourceDefinition
75817581
metadata:
75827582
annotations:
75837583
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
7584-
gateway.networking.k8s.io/bundle-version: v1.5.0
7584+
gateway.networking.k8s.io/bundle-version: v1.5.1
75857585
gateway.networking.k8s.io/channel: experimental
75867586
name: httproutes.gateway.networking.k8s.io
75877587
spec:
@@ -9414,6 +9414,8 @@ spec:
94149414
or httpRouteFilterRequestRewrite, but not both
94159415
rule: '!(self.exists(f, f.type == ''RequestRedirect'')
94169416
&& self.exists(f, f.type == ''URLRewrite''))'
9417+
- message: CORS filter cannot be repeated
9418+
rule: self.filter(f, f.type == 'CORS').size() <= 1
94179419
- message: RequestHeaderModifier filter cannot be repeated
94189420
rule: self.filter(f, f.type == 'RequestHeaderModifier').size()
94199421
<= 1
@@ -10933,6 +10935,8 @@ spec:
1093310935
or httpRouteFilterRequestRewrite, but not both
1093410936
rule: '!(self.exists(f, f.type == ''RequestRedirect'') &&
1093510937
self.exists(f, f.type == ''URLRewrite''))'
10938+
- message: CORS filter cannot be repeated
10939+
rule: self.filter(f, f.type == 'CORS').size() <= 1
1093610940
- message: RequestHeaderModifier filter cannot be repeated
1093710941
rule: self.filter(f, f.type == 'RequestHeaderModifier').size()
1093810942
<= 1
@@ -13675,6 +13679,8 @@ spec:
1367513679
or httpRouteFilterRequestRewrite, but not both
1367613680
rule: '!(self.exists(f, f.type == ''RequestRedirect'')
1367713681
&& self.exists(f, f.type == ''URLRewrite''))'
13682+
- message: CORS filter cannot be repeated
13683+
rule: self.filter(f, f.type == 'CORS').size() <= 1
1367813684
- message: RequestHeaderModifier filter cannot be repeated
1367913685
rule: self.filter(f, f.type == 'RequestHeaderModifier').size()
1368013686
<= 1
@@ -15194,6 +15200,8 @@ spec:
1519415200
or httpRouteFilterRequestRewrite, but not both
1519515201
rule: '!(self.exists(f, f.type == ''RequestRedirect'') &&
1519615202
self.exists(f, f.type == ''URLRewrite''))'
15203+
- message: CORS filter cannot be repeated
15204+
rule: self.filter(f, f.type == 'CORS').size() <= 1
1519715205
- message: RequestHeaderModifier filter cannot be repeated
1519815206
rule: self.filter(f, f.type == 'RequestHeaderModifier').size()
1519915207
<= 1
@@ -16132,7 +16140,7 @@ kind: CustomResourceDefinition
1613216140
metadata:
1613316141
annotations:
1613416142
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
16135-
gateway.networking.k8s.io/bundle-version: v1.5.0
16143+
gateway.networking.k8s.io/bundle-version: v1.5.1
1613616144
gateway.networking.k8s.io/channel: experimental
1613716145
name: listenersets.gateway.networking.k8s.io
1613816146
spec:
@@ -16916,7 +16924,7 @@ kind: CustomResourceDefinition
1691616924
metadata:
1691716925
annotations:
1691816926
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
16919-
gateway.networking.k8s.io/bundle-version: v1.5.0
16927+
gateway.networking.k8s.io/bundle-version: v1.5.1
1692016928
gateway.networking.k8s.io/channel: experimental
1692116929
name: referencegrants.gateway.networking.k8s.io
1692216930
spec:
@@ -17273,7 +17281,7 @@ kind: CustomResourceDefinition
1727317281
metadata:
1727417282
annotations:
1727517283
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
17276-
gateway.networking.k8s.io/bundle-version: v1.5.0
17284+
gateway.networking.k8s.io/bundle-version: v1.5.1
1727717285
gateway.networking.k8s.io/channel: experimental
1727817286
name: tcproutes.gateway.networking.k8s.io
1727917287
spec:
@@ -18033,7 +18041,7 @@ kind: CustomResourceDefinition
1803318041
metadata:
1803418042
annotations:
1803518043
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
18036-
gateway.networking.k8s.io/bundle-version: v1.5.0
18044+
gateway.networking.k8s.io/bundle-version: v1.5.1
1803718045
gateway.networking.k8s.io/channel: experimental
1803818046
name: tlsroutes.gateway.networking.k8s.io
1803918047
spec:
@@ -20407,7 +20415,7 @@ kind: CustomResourceDefinition
2040720415
metadata:
2040820416
annotations:
2040920417
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
20410-
gateway.networking.k8s.io/bundle-version: v1.5.0
20418+
gateway.networking.k8s.io/bundle-version: v1.5.1
2041120419
gateway.networking.k8s.io/channel: experimental
2041220420
name: udproutes.gateway.networking.k8s.io
2041320421
spec:
@@ -21219,7 +21227,7 @@ kind: CustomResourceDefinition
2121921227
metadata:
2122021228
annotations:
2122121229
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
21222-
gateway.networking.k8s.io/bundle-version: v1.5.0
21230+
gateway.networking.k8s.io/bundle-version: v1.5.1
2122321231
gateway.networking.k8s.io/channel: experimental
2122421232
labels:
2122521233
gateway.networking.k8s.io/policy: Direct
@@ -21831,7 +21839,7 @@ kind: CustomResourceDefinition
2183121839
metadata:
2183221840
annotations:
2183321841
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
21834-
gateway.networking.k8s.io/bundle-version: v1.5.0
21842+
gateway.networking.k8s.io/bundle-version: v1.5.1
2183521843
gateway.networking.k8s.io/channel: experimental
2183621844
name: xmeshes.gateway.networking.x-k8s.io
2183721845
spec:

0 commit comments

Comments
 (0)