Skip to content

Commit a9cb2ef

Browse files
zirainzhaohuabingjukie
authored
[release-1.5] cherry pick for v1.5.9 (#8217)
* feat: Ignore ready and stats listener metrics in shutdown manager calculation (#7985) * feat: Ignore ready and stats listener metrics in shutdown manager calculation Signed-off-by: zirain <zirain2009@gmail.com> * fix Signed-off-by: zirain <zirain2009@gmail.com> * fix Signed-off-by: zirain <zirain2009@gmail.com> * refactor Signed-off-by: zirain <zirain2009@gmail.com> * remove USE_SERVER_CONNECTIONS Signed-off-by: zirain <zirain2009@gmail.com> * address review comment Signed-off-by: zirain <zirain2009@gmail.com> * display the real value Signed-off-by: zirain <zirain2009@gmail.com> * comment for worker thread Signed-off-by: zirain <zirain2009@gmail.com> --------- Signed-off-by: zirain <zirain2009@gmail.com> * fix: custom response should be put at the first of the filter chain (#8061) * fix: custom response should be put before oauth2 Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> * move the custom response filter to first Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> * add release note Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> --------- Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> * fix: route idle timeout (#8058) * fix: route idle timeout Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> * address comments Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> * add test Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> --------- Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> * fix: remove global logger in message package (#8131) * fix: remove global logger in message package Signed-off-by: zirain <zirain2009@gmail.com> * fix gen Signed-off-by: zirain <zirain2009@gmail.com> * fix: controller cache-sync readiness check (#7430) Signed-off-by: zirain <zirain2009@gmail.com> * release notes for v1.5.9 (#8219) * release notes for v1.5.9 Signed-off-by: zirain <zirain2009@gmail.com> * update Signed-off-by: zirain <zirain2009@gmail.com> --------- Signed-off-by: zirain <zirain2009@gmail.com> * update VERSION Signed-off-by: zirain <zirain2009@gmail.com> * update release notes Signed-off-by: zirain <zirain2009@gmail.com> * update Signed-off-by: zirain <zirain2009@gmail.com> --------- Signed-off-by: zirain <zirain2009@gmail.com> Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> Co-authored-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> Co-authored-by: Isaac Wilson <10012479+jukie@users.noreply.github.com>
1 parent e18b109 commit a9cb2ef

27 files changed

Lines changed: 785 additions & 163 deletions

File tree

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.5.8
1+
v1.5.9

‎api/v1alpha1/envoyproxy_types.go‎

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,16 @@ type EnvoyProxySpec struct {
9898
// If unspecified, the default filter order is applied.
9999
// Default filter order is:
100100
//
101+
// - envoy.filters.http.custom_response
102+
//
101103
// - envoy.filters.http.health_check
102104
//
103105
// - envoy.filters.http.fault
104106
//
105107
// - envoy.filters.http.cors
106108
//
109+
// - envoy.filters.http.header_mutation
110+
//
107111
// - envoy.filters.http.ext_authz
108112
//
109113
// - envoy.filters.http.basic_auth
@@ -126,7 +130,15 @@ type EnvoyProxySpec struct {
126130
//
127131
// - envoy.filters.http.ratelimit
128132
//
129-
// - envoy.filters.http.custom_response
133+
// - envoy.filters.http.grpc_web
134+
//
135+
// - envoy.filters.http.grpc_stats
136+
//
137+
// - envoy.filters.http.credential_injector
138+
//
139+
// - envoy.filters.http.compressor
140+
//
141+
// - envoy.filters.http.dynamic_forward_proxy
130142
//
131143
// - envoy.filters.http.router
132144
//
@@ -228,10 +240,13 @@ type FilterPosition struct {
228240
}
229241

230242
// EnvoyFilter defines the type of Envoy HTTP filter.
231-
// +kubebuilder:validation:Enum=envoy.filters.http.health_check;envoy.filters.http.fault;envoy.filters.http.cors;envoy.filters.http.ext_authz;envoy.filters.http.api_key_auth;envoy.filters.http.basic_auth;envoy.filters.http.oauth2;envoy.filters.http.jwt_authn;envoy.filters.http.stateful_session;envoy.filters.http.lua;envoy.filters.http.ext_proc;envoy.filters.http.wasm;envoy.filters.http.rbac;envoy.filters.http.local_ratelimit;envoy.filters.http.ratelimit;envoy.filters.http.custom_response;envoy.filters.http.compressor
243+
// +kubebuilder:validation:Enum=envoy.filters.http.custom_response;envoy.filters.http.health_check;envoy.filters.http.fault;envoy.filters.http.cors;envoy.filters.http.header_mutation;envoy.filters.http.ext_authz;envoy.filters.http.api_key_auth;envoy.filters.http.basic_auth;envoy.filters.http.oauth2;envoy.filters.http.jwt_authn;envoy.filters.http.stateful_session;envoy.filters.http.buffer;envoy.filters.http.lua;envoy.filters.http.ext_proc;envoy.filters.http.wasm;envoy.filters.http.rbac;envoy.filters.http.local_ratelimit;envoy.filters.http.ratelimit;envoy.filters.http.grpc_web;envoy.filters.http.grpc_stats;envoy.filters.http.credential_injector;envoy.filters.http.compressor;envoy.filters.http.dynamic_forward_proxy
232244
type EnvoyFilter string
233245

234246
const (
247+
// EnvoyFilterCustomResponse defines the Envoy HTTP custom response filter.
248+
EnvoyFilterCustomResponse EnvoyFilter = "envoy.filters.http.custom_response"
249+
235250
// EnvoyFilterHealthCheck defines the Envoy HTTP health check filter.
236251
EnvoyFilterHealthCheck EnvoyFilter = "envoy.filters.http.health_check"
237252

@@ -241,6 +256,9 @@ const (
241256
// EnvoyFilterCORS defines the Envoy HTTP CORS filter.
242257
EnvoyFilterCORS EnvoyFilter = "envoy.filters.http.cors"
243258

259+
// EnvoyFilterHeaderMutation defines the Envoy HTTP header mutation filter
260+
EnvoyFilterHeaderMutation EnvoyFilter = "envoy.filters.http.header_mutation"
261+
244262
// EnvoyFilterExtAuthz defines the Envoy HTTP external authorization filter.
245263
EnvoyFilterExtAuthz EnvoyFilter = "envoy.filters.http.ext_authz"
246264

@@ -260,15 +278,18 @@ const (
260278
// EnvoyFilterSessionPersistence defines the Envoy HTTP session persistence filter.
261279
EnvoyFilterSessionPersistence EnvoyFilter = "envoy.filters.http.stateful_session"
262280

281+
// EnvoyFilterBuffer defines the Envoy HTTP buffer filter
282+
EnvoyFilterBuffer EnvoyFilter = "envoy.filters.http.buffer"
283+
284+
// EnvoyFilterLua defines the Envoy HTTP Lua filter.
285+
EnvoyFilterLua EnvoyFilter = "envoy.filters.http.lua"
286+
263287
// EnvoyFilterExtProc defines the Envoy HTTP external process filter.
264288
EnvoyFilterExtProc EnvoyFilter = "envoy.filters.http.ext_proc"
265289

266290
// EnvoyFilterWasm defines the Envoy HTTP WebAssembly filter.
267291
EnvoyFilterWasm EnvoyFilter = "envoy.filters.http.wasm"
268292

269-
// EnvoyFilterLua defines the Envoy HTTP Lua filter.
270-
EnvoyFilterLua EnvoyFilter = "envoy.filters.http.lua"
271-
272293
// EnvoyFilterRBAC defines the Envoy RBAC filter.
273294
EnvoyFilterRBAC EnvoyFilter = "envoy.filters.http.rbac"
274295

@@ -284,9 +305,6 @@ const (
284305
// EnvoyFilterGRPCStats defines the Envoy HTTP gRPC stats filter.
285306
EnvoyFilterGRPCStats EnvoyFilter = "envoy.filters.http.grpc_stats"
286307

287-
// EnvoyFilterCustomResponse defines the Envoy HTTP custom response filter.
288-
EnvoyFilterCustomResponse EnvoyFilter = "envoy.filters.http.custom_response"
289-
290308
// EnvoyFilterCredentialInjector defines the Envoy HTTP credential injector filter.
291309
EnvoyFilterCredentialInjector EnvoyFilter = "envoy.filters.http.credential_injector"
292310

@@ -296,9 +314,6 @@ const (
296314
// EnvoyFilterRouter defines the Envoy HTTP router filter.
297315
EnvoyFilterRouter EnvoyFilter = "envoy.filters.http.router"
298316

299-
// EnvoyFilterBuffer defines the Envoy HTTP buffer filter
300-
EnvoyFilterBuffer EnvoyFilter = "envoy.filters.http.buffer"
301-
302317
// StatFormatterRouteName defines the Route Name formatter for stats
303318
StatFormatterRouteName string = "%ROUTE_NAME%"
304319

‎charts/gateway-crds-helm/templates/generated/gateway.envoyproxy.io_envoyproxies.yaml‎

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,12 +285,16 @@ spec:
285285
If unspecified, the default filter order is applied.
286286
Default filter order is:
287287

288+
- envoy.filters.http.custom_response
289+
288290
- envoy.filters.http.health_check
289291

290292
- envoy.filters.http.fault
291293

292294
- envoy.filters.http.cors
293295

296+
- envoy.filters.http.header_mutation
297+
294298
- envoy.filters.http.ext_authz
295299

296300
- envoy.filters.http.basic_auth
@@ -313,7 +317,15 @@ spec:
313317

314318
- envoy.filters.http.ratelimit
315319

316-
- envoy.filters.http.custom_response
320+
- envoy.filters.http.grpc_web
321+
322+
- envoy.filters.http.grpc_stats
323+
324+
- envoy.filters.http.credential_injector
325+
326+
- envoy.filters.http.compressor
327+
328+
- envoy.filters.http.dynamic_forward_proxy
317329

318330
- envoy.filters.http.router
319331

@@ -327,67 +339,85 @@ spec:
327339
After defines the filter that should come after the filter.
328340
Only one of Before or After must be set.
329341
enum:
342+
- envoy.filters.http.custom_response
330343
- envoy.filters.http.health_check
331344
- envoy.filters.http.fault
332345
- envoy.filters.http.cors
346+
- envoy.filters.http.header_mutation
333347
- envoy.filters.http.ext_authz
334348
- envoy.filters.http.api_key_auth
335349
- envoy.filters.http.basic_auth
336350
- envoy.filters.http.oauth2
337351
- envoy.filters.http.jwt_authn
338352
- envoy.filters.http.stateful_session
353+
- envoy.filters.http.buffer
339354
- envoy.filters.http.lua
340355
- envoy.filters.http.ext_proc
341356
- envoy.filters.http.wasm
342357
- envoy.filters.http.rbac
343358
- envoy.filters.http.local_ratelimit
344359
- envoy.filters.http.ratelimit
345-
- envoy.filters.http.custom_response
360+
- envoy.filters.http.grpc_web
361+
- envoy.filters.http.grpc_stats
362+
- envoy.filters.http.credential_injector
346363
- envoy.filters.http.compressor
364+
- envoy.filters.http.dynamic_forward_proxy
347365
type: string
348366
before:
349367
description: |-
350368
Before defines the filter that should come before the filter.
351369
Only one of Before or After must be set.
352370
enum:
371+
- envoy.filters.http.custom_response
353372
- envoy.filters.http.health_check
354373
- envoy.filters.http.fault
355374
- envoy.filters.http.cors
375+
- envoy.filters.http.header_mutation
356376
- envoy.filters.http.ext_authz
357377
- envoy.filters.http.api_key_auth
358378
- envoy.filters.http.basic_auth
359379
- envoy.filters.http.oauth2
360380
- envoy.filters.http.jwt_authn
361381
- envoy.filters.http.stateful_session
382+
- envoy.filters.http.buffer
362383
- envoy.filters.http.lua
363384
- envoy.filters.http.ext_proc
364385
- envoy.filters.http.wasm
365386
- envoy.filters.http.rbac
366387
- envoy.filters.http.local_ratelimit
367388
- envoy.filters.http.ratelimit
368-
- envoy.filters.http.custom_response
389+
- envoy.filters.http.grpc_web
390+
- envoy.filters.http.grpc_stats
391+
- envoy.filters.http.credential_injector
369392
- envoy.filters.http.compressor
393+
- envoy.filters.http.dynamic_forward_proxy
370394
type: string
371395
name:
372396
description: Name of the filter.
373397
enum:
398+
- envoy.filters.http.custom_response
374399
- envoy.filters.http.health_check
375400
- envoy.filters.http.fault
376401
- envoy.filters.http.cors
402+
- envoy.filters.http.header_mutation
377403
- envoy.filters.http.ext_authz
378404
- envoy.filters.http.api_key_auth
379405
- envoy.filters.http.basic_auth
380406
- envoy.filters.http.oauth2
381407
- envoy.filters.http.jwt_authn
382408
- envoy.filters.http.stateful_session
409+
- envoy.filters.http.buffer
383410
- envoy.filters.http.lua
384411
- envoy.filters.http.ext_proc
385412
- envoy.filters.http.wasm
386413
- envoy.filters.http.rbac
387414
- envoy.filters.http.local_ratelimit
388415
- envoy.filters.http.ratelimit
389-
- envoy.filters.http.custom_response
416+
- envoy.filters.http.grpc_web
417+
- envoy.filters.http.grpc_stats
418+
- envoy.filters.http.credential_injector
390419
- envoy.filters.http.compressor
420+
- envoy.filters.http.dynamic_forward_proxy
391421
type: string
392422
required:
393423
- name

‎charts/gateway-helm/crds/generated/gateway.envoyproxy.io_envoyproxies.yaml‎

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,12 +284,16 @@ spec:
284284
If unspecified, the default filter order is applied.
285285
Default filter order is:
286286

287+
- envoy.filters.http.custom_response
288+
287289
- envoy.filters.http.health_check
288290

289291
- envoy.filters.http.fault
290292

291293
- envoy.filters.http.cors
292294

295+
- envoy.filters.http.header_mutation
296+
293297
- envoy.filters.http.ext_authz
294298

295299
- envoy.filters.http.basic_auth
@@ -312,7 +316,15 @@ spec:
312316

313317
- envoy.filters.http.ratelimit
314318

315-
- envoy.filters.http.custom_response
319+
- envoy.filters.http.grpc_web
320+
321+
- envoy.filters.http.grpc_stats
322+
323+
- envoy.filters.http.credential_injector
324+
325+
- envoy.filters.http.compressor
326+
327+
- envoy.filters.http.dynamic_forward_proxy
316328

317329
- envoy.filters.http.router
318330

@@ -326,67 +338,85 @@ spec:
326338
After defines the filter that should come after the filter.
327339
Only one of Before or After must be set.
328340
enum:
341+
- envoy.filters.http.custom_response
329342
- envoy.filters.http.health_check
330343
- envoy.filters.http.fault
331344
- envoy.filters.http.cors
345+
- envoy.filters.http.header_mutation
332346
- envoy.filters.http.ext_authz
333347
- envoy.filters.http.api_key_auth
334348
- envoy.filters.http.basic_auth
335349
- envoy.filters.http.oauth2
336350
- envoy.filters.http.jwt_authn
337351
- envoy.filters.http.stateful_session
352+
- envoy.filters.http.buffer
338353
- envoy.filters.http.lua
339354
- envoy.filters.http.ext_proc
340355
- envoy.filters.http.wasm
341356
- envoy.filters.http.rbac
342357
- envoy.filters.http.local_ratelimit
343358
- envoy.filters.http.ratelimit
344-
- envoy.filters.http.custom_response
359+
- envoy.filters.http.grpc_web
360+
- envoy.filters.http.grpc_stats
361+
- envoy.filters.http.credential_injector
345362
- envoy.filters.http.compressor
363+
- envoy.filters.http.dynamic_forward_proxy
346364
type: string
347365
before:
348366
description: |-
349367
Before defines the filter that should come before the filter.
350368
Only one of Before or After must be set.
351369
enum:
370+
- envoy.filters.http.custom_response
352371
- envoy.filters.http.health_check
353372
- envoy.filters.http.fault
354373
- envoy.filters.http.cors
374+
- envoy.filters.http.header_mutation
355375
- envoy.filters.http.ext_authz
356376
- envoy.filters.http.api_key_auth
357377
- envoy.filters.http.basic_auth
358378
- envoy.filters.http.oauth2
359379
- envoy.filters.http.jwt_authn
360380
- envoy.filters.http.stateful_session
381+
- envoy.filters.http.buffer
361382
- envoy.filters.http.lua
362383
- envoy.filters.http.ext_proc
363384
- envoy.filters.http.wasm
364385
- envoy.filters.http.rbac
365386
- envoy.filters.http.local_ratelimit
366387
- envoy.filters.http.ratelimit
367-
- envoy.filters.http.custom_response
388+
- envoy.filters.http.grpc_web
389+
- envoy.filters.http.grpc_stats
390+
- envoy.filters.http.credential_injector
368391
- envoy.filters.http.compressor
392+
- envoy.filters.http.dynamic_forward_proxy
369393
type: string
370394
name:
371395
description: Name of the filter.
372396
enum:
397+
- envoy.filters.http.custom_response
373398
- envoy.filters.http.health_check
374399
- envoy.filters.http.fault
375400
- envoy.filters.http.cors
401+
- envoy.filters.http.header_mutation
376402
- envoy.filters.http.ext_authz
377403
- envoy.filters.http.api_key_auth
378404
- envoy.filters.http.basic_auth
379405
- envoy.filters.http.oauth2
380406
- envoy.filters.http.jwt_authn
381407
- envoy.filters.http.stateful_session
408+
- envoy.filters.http.buffer
382409
- envoy.filters.http.lua
383410
- envoy.filters.http.ext_proc
384411
- envoy.filters.http.wasm
385412
- envoy.filters.http.rbac
386413
- envoy.filters.http.local_ratelimit
387414
- envoy.filters.http.ratelimit
388-
- envoy.filters.http.custom_response
415+
- envoy.filters.http.grpc_web
416+
- envoy.filters.http.grpc_stats
417+
- envoy.filters.http.credential_injector
389418
- envoy.filters.http.compressor
419+
- envoy.filters.http.dynamic_forward_proxy
390420
type: string
391421
required:
392422
- name

0 commit comments

Comments
 (0)