Skip to content

Commit 0f45ef1

Browse files
authored
Merge branch 'main' into feat/clienttrafficpolicy-listenerset-targetref
Signed-off-by: Isaac Wilson <[email protected]>
2 parents 8ad4310 + 8ff4a2f commit 0f45ef1

51 files changed

Lines changed: 1953 additions & 213 deletions

File tree

Some content is hidden

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

‎api/v1alpha1/ratelimit_types.go‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ type LocalRateLimit struct {
6868
// +optional
6969
// +kubebuilder:validation:MaxItems=16
7070
// +kubebuilder:validation:XValidation:rule="self.all(r, !has(r.cost) || !has(r.cost.response))", message="response cost is not supported for Local Rate Limits"
71+
// +kubebuilder:validation:XValidation:rule="self.all(r, !has(r.limit.fromMetadata))", message="limit fromMetadata is not supported for Local Rate Limits"
7172
Rules []RateLimitRule `json:"rules"`
7273
}
7374

@@ -440,6 +441,32 @@ type RateLimitValue struct {
440441
// +kubebuilder:validation:Format=uint32
441442
Requests uint32 `json:"requests"`
442443
Unit RateLimitUnit `json:"unit"`
444+
// FromMetadata sources the limit value from per-request dynamic metadata.
445+
// When the referenced metadata value is present, it overrides Requests/Unit for that
446+
// request; otherwise Requests/Unit are used as the default.
447+
//
448+
// The referenced metadata value must be a struct containing an integer "requests_per_unit"
449+
// property and a "unit" property with a value parseable to a RateLimitUnit. An upstream
450+
// filter (e.g. ext_proc) is responsible for writing this struct into dynamic metadata.
451+
//
452+
// Only supported for Global Rate Limits.
453+
//
454+
// +optional
455+
FromMetadata *RateLimitValueMetadata `json:"fromMetadata,omitempty"`
456+
}
457+
458+
// RateLimitValueMetadata specifies the dynamic metadata to retrieve the limit value from.
459+
type RateLimitValueMetadata struct {
460+
// Namespace is the namespace of the dynamic metadata.
461+
//
462+
// +kubebuilder:validation:Required
463+
// +kubebuilder:validation:MinLength=1
464+
Namespace string `json:"namespace"`
465+
// Key is the key to retrieve the limit value from within the namespaced filter metadata.
466+
//
467+
// +kubebuilder:validation:Required
468+
// +kubebuilder:validation:MinLength=1
469+
Key string `json:"key"`
443470
}
444471

445472
// RateLimitUnit specifies the intervals for setting rate limits.

‎api/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 21 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dependencies:
22
- name: prometheus
33
repository: https://prometheus-community.github.io/helm-charts
4-
version: 29.9.0
4+
version: 29.10.1
55
- name: grafana
66
repository: https://grafana.github.io/helm-charts
77
version: 10.5.15
@@ -10,7 +10,7 @@ dependencies:
1010
version: 0.56.0
1111
- name: alloy
1212
repository: https://grafana.github.io/helm-charts
13-
version: 1.8.2
13+
version: 1.9.0
1414
- name: loki
1515
repository: https://grafana.github.io/helm-charts
1616
version: 7.0.0
@@ -19,6 +19,6 @@ dependencies:
1919
version: 1.3.1
2020
- name: opentelemetry-collector
2121
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
22-
version: 0.158.0
23-
digest: sha256:7ef3bdf6f6545702f5ec4c4d5262e22e08b401ec74d715ca4a0dbee59dfe9e50
24-
generated: "2026-06-04T01:10:11.004609837Z"
22+
version: 0.158.1
23+
digest: sha256:fa0e730cdf0addf90587c9596bc142b4558a8cc106e06236de4e44d873c7f92a
24+
generated: "2026-06-10T04:13:56.930385898Z"

‎charts/gateway-addons-helm/Chart.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ sources:
2626

2727
dependencies:
2828
- name: prometheus
29-
version: 29.9.0
29+
version: 29.10.1
3030
repository: https://prometheus-community.github.io/helm-charts
3131
condition: prometheus.enabled
3232
- name: grafana
@@ -39,7 +39,7 @@ dependencies:
3939
condition: fluent-bit.enabled
4040
- name: alloy
4141
repository: https://grafana.github.io/helm-charts
42-
version: 1.8.2
42+
version: 1.9.0
4343
condition: alloy.enabled
4444
- name: loki
4545
version: 7.0.0
@@ -51,5 +51,5 @@ dependencies:
5151
condition: tempo.enabled
5252
- name: opentelemetry-collector
5353
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
54-
version: 0.158.0
54+
version: 0.158.1
5555
condition: opentelemetry-collector.enabled

‎charts/gateway-addons-helm/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ An Add-ons Helm chart for Envoy Gateway
2222
| Repository | Name | Version |
2323
|------------|------|---------|
2424
| https://fluent.github.io/helm-charts | fluent-bit | 0.56.0 |
25-
| https://grafana.github.io/helm-charts | alloy | 1.8.2 |
25+
| https://grafana.github.io/helm-charts | alloy | 1.9.0 |
2626
| https://grafana.github.io/helm-charts | grafana | 10.5.15 |
2727
| https://grafana.github.io/helm-charts | loki | 7.0.0 |
2828
| https://grafana.github.io/helm-charts | tempo | 1.3.1 |
29-
| https://open-telemetry.github.io/opentelemetry-helm-charts | opentelemetry-collector | 0.158.0 |
30-
| https://prometheus-community.github.io/helm-charts | prometheus | 29.9.0 |
29+
| https://open-telemetry.github.io/opentelemetry-helm-charts | opentelemetry-collector | 0.158.1 |
30+
| https://prometheus-community.github.io/helm-charts | prometheus | 29.10.1 |
3131

3232
## Usage
3333

@@ -172,7 +172,7 @@ helm uninstall eg-addons -n monitoring
172172
| opentelemetry-collector.enabled | bool | `false` | |
173173
| opentelemetry-collector.fullnameOverride | string | `"otel-collector"` | |
174174
| opentelemetry-collector.image.repository | string | `"otel/opentelemetry-collector-contrib"` | |
175-
| opentelemetry-collector.image.tag | string | `"0.153.0"` | |
175+
| opentelemetry-collector.image.tag | string | `"0.154.0"` | |
176176
| opentelemetry-collector.mode | string | `"deployment"` | |
177177
| opentelemetry-collector.ports.datadog.containerPort | int | `8126` | |
178178
| opentelemetry-collector.ports.datadog.enabled | bool | `true` | |

‎charts/gateway-addons-helm/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ opentelemetry-collector:
940940
mode: deployment
941941
image:
942942
repository: "otel/opentelemetry-collector-contrib"
943-
tag: "0.153.0"
943+
tag: "0.154.0"
944944
config:
945945
exporters:
946946
prometheus:

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

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1796,6 +1796,33 @@ spec:
17961796
429 HTTP status code is sent back to the client when
17971797
the selected requests have reached the limit.
17981798
properties:
1799+
fromMetadata:
1800+
description: |-
1801+
FromMetadata sources the limit value from per-request dynamic metadata.
1802+
When the referenced metadata value is present, it overrides Requests/Unit for that
1803+
request; otherwise Requests/Unit are used as the default.
1804+
1805+
The referenced metadata value must be a struct containing an integer "requests_per_unit"
1806+
property and a "unit" property with a value parseable to a RateLimitUnit. An upstream
1807+
filter (e.g. ext_proc) is responsible for writing this struct into dynamic metadata.
1808+
1809+
Only supported for Global Rate Limits.
1810+
properties:
1811+
key:
1812+
description: Key is the key to retrieve the
1813+
limit value from within the namespaced filter
1814+
metadata.
1815+
minLength: 1
1816+
type: string
1817+
namespace:
1818+
description: Namespace is the namespace of the
1819+
dynamic metadata.
1820+
minLength: 1
1821+
type: string
1822+
required:
1823+
- key
1824+
- namespace
1825+
type: object
17991826
requests:
18001827
description: |-
18011828
Requests is the number of requests (or cost units, when used with
@@ -2180,6 +2207,33 @@ spec:
21802207
429 HTTP status code is sent back to the client when
21812208
the selected requests have reached the limit.
21822209
properties:
2210+
fromMetadata:
2211+
description: |-
2212+
FromMetadata sources the limit value from per-request dynamic metadata.
2213+
When the referenced metadata value is present, it overrides Requests/Unit for that
2214+
request; otherwise Requests/Unit are used as the default.
2215+
2216+
The referenced metadata value must be a struct containing an integer "requests_per_unit"
2217+
property and a "unit" property with a value parseable to a RateLimitUnit. An upstream
2218+
filter (e.g. ext_proc) is responsible for writing this struct into dynamic metadata.
2219+
2220+
Only supported for Global Rate Limits.
2221+
properties:
2222+
key:
2223+
description: Key is the key to retrieve the
2224+
limit value from within the namespaced filter
2225+
metadata.
2226+
minLength: 1
2227+
type: string
2228+
namespace:
2229+
description: Namespace is the namespace of the
2230+
dynamic metadata.
2231+
minLength: 1
2232+
type: string
2233+
required:
2234+
- key
2235+
- namespace
2236+
type: object
21832237
requests:
21842238
description: |-
21852239
Requests is the number of requests (or cost units, when used with
@@ -2236,6 +2290,9 @@ spec:
22362290
x-kubernetes-validations:
22372291
- message: response cost is not supported for Local Rate Limits
22382292
rule: self.all(r, !has(r.cost) || !has(r.cost.response))
2293+
- message: limit fromMetadata is not supported for Local Rate
2294+
Limits
2295+
rule: self.all(r, !has(r.limit.fromMetadata))
22392296
type: object
22402297
type:
22412298
description: |-

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

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1795,6 +1795,33 @@ spec:
17951795
429 HTTP status code is sent back to the client when
17961796
the selected requests have reached the limit.
17971797
properties:
1798+
fromMetadata:
1799+
description: |-
1800+
FromMetadata sources the limit value from per-request dynamic metadata.
1801+
When the referenced metadata value is present, it overrides Requests/Unit for that
1802+
request; otherwise Requests/Unit are used as the default.
1803+
1804+
The referenced metadata value must be a struct containing an integer "requests_per_unit"
1805+
property and a "unit" property with a value parseable to a RateLimitUnit. An upstream
1806+
filter (e.g. ext_proc) is responsible for writing this struct into dynamic metadata.
1807+
1808+
Only supported for Global Rate Limits.
1809+
properties:
1810+
key:
1811+
description: Key is the key to retrieve the
1812+
limit value from within the namespaced filter
1813+
metadata.
1814+
minLength: 1
1815+
type: string
1816+
namespace:
1817+
description: Namespace is the namespace of the
1818+
dynamic metadata.
1819+
minLength: 1
1820+
type: string
1821+
required:
1822+
- key
1823+
- namespace
1824+
type: object
17981825
requests:
17991826
description: |-
18001827
Requests is the number of requests (or cost units, when used with
@@ -2179,6 +2206,33 @@ spec:
21792206
429 HTTP status code is sent back to the client when
21802207
the selected requests have reached the limit.
21812208
properties:
2209+
fromMetadata:
2210+
description: |-
2211+
FromMetadata sources the limit value from per-request dynamic metadata.
2212+
When the referenced metadata value is present, it overrides Requests/Unit for that
2213+
request; otherwise Requests/Unit are used as the default.
2214+
2215+
The referenced metadata value must be a struct containing an integer "requests_per_unit"
2216+
property and a "unit" property with a value parseable to a RateLimitUnit. An upstream
2217+
filter (e.g. ext_proc) is responsible for writing this struct into dynamic metadata.
2218+
2219+
Only supported for Global Rate Limits.
2220+
properties:
2221+
key:
2222+
description: Key is the key to retrieve the
2223+
limit value from within the namespaced filter
2224+
metadata.
2225+
minLength: 1
2226+
type: string
2227+
namespace:
2228+
description: Namespace is the namespace of the
2229+
dynamic metadata.
2230+
minLength: 1
2231+
type: string
2232+
required:
2233+
- key
2234+
- namespace
2235+
type: object
21822236
requests:
21832237
description: |-
21842238
Requests is the number of requests (or cost units, when used with
@@ -2235,6 +2289,9 @@ spec:
22352289
x-kubernetes-validations:
22362290
- message: response cost is not supported for Local Rate Limits
22372291
rule: self.all(r, !has(r.cost) || !has(r.cost.response))
2292+
- message: limit fromMetadata is not supported for Local Rate
2293+
Limits
2294+
rule: self.all(r, !has(r.limit.fromMetadata))
22382295
type: object
22392296
type:
22402297
description: |-

‎examples/extension-server/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/urfave/cli/v2 v2.27.7
1010
google.golang.org/grpc v1.81.1
1111
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af
12-
k8s.io/apimachinery v0.36.1
12+
k8s.io/apimachinery v0.36.2
1313
sigs.k8s.io/controller-runtime v0.24.1
1414
sigs.k8s.io/gateway-api v1.5.1
1515
sigs.k8s.io/gateway-api-inference-extension v1.5.0
@@ -65,9 +65,9 @@ require (
6565
gopkg.in/inf.v0 v0.9.1 // indirect
6666
gopkg.in/yaml.v2 v2.4.0 // indirect
6767
gopkg.in/yaml.v3 v3.0.1 // indirect
68-
k8s.io/api v0.36.1 // indirect
69-
k8s.io/apiextensions-apiserver v0.36.1 // indirect
70-
k8s.io/code-generator v0.36.1 // indirect
68+
k8s.io/api v0.36.2 // indirect
69+
k8s.io/apiextensions-apiserver v0.36.2 // indirect
70+
k8s.io/code-generator v0.36.2 // indirect
7171
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b // indirect
7272
k8s.io/klog/v2 v2.140.0 // indirect
7373
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a // indirect

0 commit comments

Comments
 (0)