Skip to content

Commit f926f90

Browse files
zirainzirain
authored
Merge branch 'main' into client-wrr
2 parents 5c1c20b + 1e295b6 commit f926f90

File tree

88 files changed

+2321
-442
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+2321
-442
lines changed

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ jobs:
3636
- uses: ./tools/github-actions/setup-deps
3737

3838
- name: Initialize CodeQL
39-
uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v3.29.5
39+
uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
4040
with:
4141
languages: ${{ matrix.language }}
4242

4343
- name: Autobuild
44-
uses: github/codeql-action/autobuild@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v3.29.5
44+
uses: github/codeql-action/autobuild@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
4545

4646
- name: Perform CodeQL Analysis
47-
uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v3.29.5
47+
uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
4848
with:
4949
category: "/language:${{matrix.language}}"

‎.github/workflows/license-scan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Checkout code
1919
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2020
- name: Run scanner
21-
uses: google/osv-scanner-action/osv-scanner-action@e92b5d07338d4f0ba0981dffed17c48976ca4730 # v2.2.3
21+
uses: google/osv-scanner-action/osv-scanner-action@9bb69575e74019c2ad085a1860787043adf47ccb # v2.2.4
2222
with:
2323
scan-args: |- # See allowed licenses at https://github.com/cncf/foundation/blob/main/policies-guidance/allowed-third-party-license-policy.md#approved-licenses-for-allowlist
2424
--licenses=Apache-2.0,0BSD,BSD-2-Clause,BSD-2-Clause-FreeBSD,BSD-3-Clause,MIT,MIT-0,ISC,OpenSSL,OpenSSL-standalone,PSF-2.0,Python-2.0,Python-2.0.1,PostgreSQL,SSLeay-standalone,UPL-1.0,X11,Zlib

‎.github/workflows/osv-scanner.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ permissions:
1919
jobs:
2020
scan-scheduled:
2121
if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
22-
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@e92b5d07338d4f0ba0981dffed17c48976ca4730" # v2.2.3
22+
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@9bb69575e74019c2ad085a1860787043adf47ccb" # v2.2.4
2323
with:
2424
scan-args: |-
2525
--recursive
@@ -32,7 +32,7 @@ jobs:
3232

3333
scan-pr:
3434
if: ${{ github.event_name == 'pull_request' || github.event_name == 'merge_group' }}
35-
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@e92b5d07338d4f0ba0981dffed17c48976ca4730" # v2.2.3
35+
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@9bb69575e74019c2ad085a1860787043adf47ccb" # v2.2.4
3636
with:
3737
scan-args: |-
3838
--recursive

‎.github/workflows/scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ jobs:
4040
retention-days: 5
4141

4242
- name: "Upload to code-scanning"
43-
uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v3.29.5
43+
uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
4444
with:
4545
sarif_file: results.sarif

‎api/v1alpha1/envoyproxy_types.go‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ type EnvoyProxySpec struct {
106106
//
107107
// - envoy.filters.http.ext_authz
108108
//
109+
// - envoy.filters.http.api_key_auth
110+
//
109111
// - envoy.filters.http.basic_auth
110112
//
111113
// - envoy.filters.http.oauth2
@@ -114,6 +116,8 @@ type EnvoyProxySpec struct {
114116
//
115117
// - envoy.filters.http.stateful_session
116118
//
119+
// - envoy.filters.http.buffer
120+
//
117121
// - envoy.filters.http.lua
118122
//
119123
// - envoy.filters.http.ext_proc
@@ -126,8 +130,16 @@ type EnvoyProxySpec struct {
126130
//
127131
// - envoy.filters.http.ratelimit
128132
//
133+
// - envoy.filters.http.grpc_web
134+
//
135+
// - envoy.filters.http.grpc_stats
136+
//
129137
// - envoy.filters.http.custom_response
130138
//
139+
// - envoy.filters.http.credential_injector
140+
//
141+
// - envoy.filters.http.compressor
142+
//
131143
// - envoy.filters.http.router
132144
//
133145
// Note: "envoy.filters.http.router" cannot be reordered, it's always the last filter in the chain.
@@ -222,7 +234,7 @@ type FilterPosition struct {
222234
}
223235

224236
// EnvoyFilter defines the type of Envoy HTTP filter.
225-
// +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
237+
// +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.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.custom_response;envoy.filters.http.credential_injector;envoy.filters.http.compressor
226238
type EnvoyFilter string
227239

228240
const (

‎api/v1alpha1/ratelimit_types.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@ import (
1010
)
1111

1212
// RateLimitSpec defines the desired state of RateLimitSpec.
13-
// +union
1413
type RateLimitSpec struct {
1514
// Type decides the scope for the RateLimits.
1615
// Valid RateLimitType values are "Global" or "Local".
1716
//
18-
// +unionDiscriminator
19-
Type RateLimitType `json:"type"`
17+
// Deprecated: Use Global and/or Local fields directly instead. Both can be specified simultaneously for combined rate limiting.
18+
//
19+
// +optional
20+
Type *RateLimitType `json:"type,omitempty"`
2021
// Global defines global rate limit configuration.
2122
//
2223
// +optional

‎api/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1586,12 +1586,12 @@ spec:
15861586
description: |-
15871587
Type decides the scope for the RateLimits.
15881588
Valid RateLimitType values are "Global" or "Local".
1589+
1590+
Deprecated: Use Global and/or Local fields directly instead. Both can be specified simultaneously for combined rate limiting.
15891591
enum:
15901592
- Global
15911593
- Local
15921594
type: string
1593-
required:
1594-
- type
15951595
type: object
15961596
requestBuffer:
15971597
description: |-

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,8 @@ spec:
292292

293293
- envoy.filters.http.ext_authz
294294

295+
- envoy.filters.http.api_key_auth
296+
295297
- envoy.filters.http.basic_auth
296298

297299
- envoy.filters.http.oauth2
@@ -300,6 +302,8 @@ spec:
300302

301303
- envoy.filters.http.stateful_session
302304

305+
- envoy.filters.http.buffer
306+
303307
- envoy.filters.http.lua
304308

305309
- envoy.filters.http.ext_proc
@@ -312,8 +316,16 @@ spec:
312316

313317
- envoy.filters.http.ratelimit
314318

319+
- envoy.filters.http.grpc_web
320+
321+
- envoy.filters.http.grpc_stats
322+
315323
- envoy.filters.http.custom_response
316324

325+
- envoy.filters.http.credential_injector
326+
327+
- envoy.filters.http.compressor
328+
317329
- envoy.filters.http.router
318330

319331
Note: "envoy.filters.http.router" cannot be reordered, it's always the last filter in the chain.
@@ -335,13 +347,17 @@ spec:
335347
- envoy.filters.http.oauth2
336348
- envoy.filters.http.jwt_authn
337349
- envoy.filters.http.stateful_session
350+
- envoy.filters.http.buffer
338351
- envoy.filters.http.lua
339352
- envoy.filters.http.ext_proc
340353
- envoy.filters.http.wasm
341354
- envoy.filters.http.rbac
342355
- envoy.filters.http.local_ratelimit
343356
- envoy.filters.http.ratelimit
357+
- envoy.filters.http.grpc_web
358+
- envoy.filters.http.grpc_stats
344359
- envoy.filters.http.custom_response
360+
- envoy.filters.http.credential_injector
345361
- envoy.filters.http.compressor
346362
type: string
347363
before:
@@ -358,13 +374,17 @@ spec:
358374
- envoy.filters.http.oauth2
359375
- envoy.filters.http.jwt_authn
360376
- envoy.filters.http.stateful_session
377+
- envoy.filters.http.buffer
361378
- envoy.filters.http.lua
362379
- envoy.filters.http.ext_proc
363380
- envoy.filters.http.wasm
364381
- envoy.filters.http.rbac
365382
- envoy.filters.http.local_ratelimit
366383
- envoy.filters.http.ratelimit
384+
- envoy.filters.http.grpc_web
385+
- envoy.filters.http.grpc_stats
367386
- envoy.filters.http.custom_response
387+
- envoy.filters.http.credential_injector
368388
- envoy.filters.http.compressor
369389
type: string
370390
name:
@@ -379,13 +399,17 @@ spec:
379399
- envoy.filters.http.oauth2
380400
- envoy.filters.http.jwt_authn
381401
- envoy.filters.http.stateful_session
402+
- envoy.filters.http.buffer
382403
- envoy.filters.http.lua
383404
- envoy.filters.http.ext_proc
384405
- envoy.filters.http.wasm
385406
- envoy.filters.http.rbac
386407
- envoy.filters.http.local_ratelimit
387408
- envoy.filters.http.ratelimit
409+
- envoy.filters.http.grpc_web
410+
- envoy.filters.http.grpc_stats
388411
- envoy.filters.http.custom_response
412+
- envoy.filters.http.credential_injector
389413
- envoy.filters.http.compressor
390414
type: string
391415
required:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1585,12 +1585,12 @@ spec:
15851585
description: |-
15861586
Type decides the scope for the RateLimits.
15871587
Valid RateLimitType values are "Global" or "Local".
1588+
1589+
Deprecated: Use Global and/or Local fields directly instead. Both can be specified simultaneously for combined rate limiting.
15881590
enum:
15891591
- Global
15901592
- Local
15911593
type: string
1592-
required:
1593-
- type
15941594
type: object
15951595
requestBuffer:
15961596
description: |-

0 commit comments

Comments
 (0)