Skip to content

Commit 93a3f2c

Browse files
zirainzirain
committed
Merge branch 'main' into fix/route-match-order
2 parents 9b63b3c + ced5d75 commit 93a3f2c

File tree

67 files changed

+3136
-380
lines changed

Some content is hidden

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

67 files changed

+3136
-380
lines changed

‎.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@
55

66
# Collapse generated code in code reviews.
77
**/zz_generated.*.go linguist-generated=true
8+
9+
# Treat WASM files as binary to prevent any modifications
10+
*.wasm binary

‎api/v1alpha1/envoyproxy_types.go‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,10 @@ type ProxyTelemetry struct {
354354

355355
// Metrics defines metrics configuration for managed proxies.
356356
Metrics *ProxyMetrics `json:"metrics,omitempty"`
357+
358+
// RequestID configures Envoy request ID behavior.
359+
// +optional
360+
RequestID *RequestIDSettings `json:"requestID,omitempty"`
357361
}
358362

359363
// EnvoyProxyProviderType defines the types of providers supported by Envoy Proxy.
@@ -369,6 +373,44 @@ const (
369373
EnvoyProxyProviderTypeHost EnvoyProxyProviderType = "Host"
370374
)
371375

376+
// RequestIDSettings defines configuration for Envoy's UUID request ID extension.
377+
type RequestIDSettings struct {
378+
// Tracing configures Envoy's behavior for the UUID request ID extension,
379+
// including whether the trace sampling decision is packed into the UUID and
380+
// whether `X-Request-ID` is used for trace sampling decisions.
381+
//
382+
// When omitted, the default behavior is `PackAndSample`, which alters the UUID
383+
// to contain the trace sampling decision and uses `X-Request-ID` for stable
384+
// trace sampling.
385+
//
386+
// +optional
387+
Tracing *RequestIDExtensionAction `json:"tracing,omitempty"`
388+
}
389+
390+
// RequestIDExtensionAction defines how the UUID request ID extension behaves
391+
// with respect to packing the trace reason into the UUID and using the
392+
// request ID for trace sampling decisions.
393+
//
394+
// +kubebuilder:validation:Enum=PackAndSample;Sample;Pack;Disable
395+
type RequestIDExtensionAction string
396+
397+
const (
398+
// PackAndSample enables both behaviors:
399+
// - Alters the UUID to contain the trace sampling decision
400+
// - Uses `X-Request-ID` for trace sampling
401+
RequestIDExtensionActionPackAndSample RequestIDExtensionAction = "PackAndSample"
402+
// Sample uses `X-Request-ID` for trace sampling decisions, but does NOT alter
403+
// the UUID to pack the trace sampling decision.
404+
RequestIDExtensionActionSample RequestIDExtensionAction = "Sample"
405+
// Pack alters the UUID to contain the trace sampling decision, but does NOT
406+
// use `X-Request-ID` for trace sampling decisions.
407+
RequestIDExtensionActionPack RequestIDExtensionAction = "Pack"
408+
// Disable disables both behaviors:
409+
// - Does not alter the UUID
410+
// - Does not use `X-Request-ID` for trace sampling
411+
RequestIDExtensionActionDisable RequestIDExtensionAction = "Disable"
412+
)
413+
372414
// EnvoyProxyProvider defines the desired state of a resource provider.
373415
// +union
374416
type EnvoyProxyProvider struct {

‎api/v1alpha1/zz_generated.deepcopy.go‎

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

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
dependencies:
22
- name: prometheus
33
repository: https://prometheus-community.github.io/helm-charts
4-
version: 28.3.0
4+
version: 28.6.0
55
- name: grafana
66
repository: https://grafana.github.io/helm-charts
7-
version: 10.5.6
7+
version: 10.5.8
88
- name: fluent-bit
99
repository: https://fluent.github.io/helm-charts
1010
version: 0.54.1
@@ -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.143.0
23-
digest: sha256:04234e77c3b3d2c11c22944c6cf52c2e17366f4b5523b3d14d59cc3c73f30f49
24-
generated: "2026-01-14T04:20:25.512091635Z"
22+
version: 0.143.1
23+
digest: sha256:4ea9d08afb6040654c4caef61eb0e9a3a98fcdb39e116da5406db6aa7f49fdac
24+
generated: "2026-01-21T04:18:17.195558874Z"

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

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

2727
dependencies:
2828
- name: prometheus
29-
version: 28.3.0
29+
version: 28.6.0
3030
repository: https://prometheus-community.github.io/helm-charts
3131
condition: prometheus.enabled
3232
- name: grafana
3333
repository: https://grafana.github.io/helm-charts
34-
version: 10.5.6
34+
version: 10.5.8
3535
condition: grafana.enabled
3636
- name: fluent-bit
3737
repository: https://fluent.github.io/helm-charts
@@ -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.143.0
54+
version: 0.143.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
@@ -23,11 +23,11 @@ An Add-ons Helm chart for Envoy Gateway
2323
|------------|------|---------|
2424
| https://fluent.github.io/helm-charts | fluent-bit | 0.54.1 |
2525
| https://grafana.github.io/helm-charts | alloy | 1.5.2 |
26-
| https://grafana.github.io/helm-charts | grafana | 10.5.6 |
26+
| https://grafana.github.io/helm-charts | grafana | 10.5.8 |
2727
| https://grafana.github.io/helm-charts | loki | 6.49.0 |
2828
| https://grafana.github.io/helm-charts | tempo | 1.3.1 |
29-
| https://open-telemetry.github.io/opentelemetry-helm-charts | opentelemetry-collector | 0.143.0 |
30-
| https://prometheus-community.github.io/helm-charts | prometheus | 28.3.0 |
29+
| https://open-telemetry.github.io/opentelemetry-helm-charts | opentelemetry-collector | 0.143.1 |
30+
| https://prometheus-community.github.io/helm-charts | prometheus | 28.6.0 |
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.143.1"` | |
175+
| opentelemetry-collector.image.tag | string | `"0.144.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
@@ -868,7 +868,7 @@ opentelemetry-collector:
868868
mode: deployment
869869
image:
870870
repository: "otel/opentelemetry-collector-contrib"
871-
tag: "0.143.1"
871+
tag: "0.144.0"
872872
config:
873873
exporters:
874874
prometheus:

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14979,6 +14979,25 @@ spec:
1497914979
maxItems: 16
1498014980
type: array
1498114981
type: object
14982+
requestID:
14983+
description: RequestID configures Envoy request ID behavior.
14984+
properties:
14985+
tracing:
14986+
description: |-
14987+
Tracing configures Envoy's behavior for the UUID request ID extension,
14988+
including whether the trace sampling decision is packed into the UUID and
14989+
whether `X-Request-ID` is used for trace sampling decisions.
14990+
14991+
When omitted, the default behavior is `PackAndSample`, which alters the UUID
14992+
to contain the trace sampling decision and uses `X-Request-ID` for stable
14993+
trace sampling.
14994+
enum:
14995+
- PackAndSample
14996+
- Sample
14997+
- Pack
14998+
- Disable
14999+
type: string
15000+
type: object
1498215001
tracing:
1498315002
description: |-
1498415003
Tracing defines tracing configuration for managed proxies.

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14978,6 +14978,25 @@ spec:
1497814978
maxItems: 16
1497914979
type: array
1498014980
type: object
14981+
requestID:
14982+
description: RequestID configures Envoy request ID behavior.
14983+
properties:
14984+
tracing:
14985+
description: |-
14986+
Tracing configures Envoy's behavior for the UUID request ID extension,
14987+
including whether the trace sampling decision is packed into the UUID and
14988+
whether `X-Request-ID` is used for trace sampling decisions.
14989+
14990+
When omitted, the default behavior is `PackAndSample`, which alters the UUID
14991+
to contain the trace sampling decision and uses `X-Request-ID` for stable
14992+
trace sampling.
14993+
enum:
14994+
- PackAndSample
14995+
- Sample
14996+
- Pack
14997+
- Disable
14998+
type: string
14999+
type: object
1498115000
tracing:
1498215001
description: |-
1498315002
Tracing defines tracing configuration for managed proxies.

‎examples/extension-server/go.mod‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ require (
1010
google.golang.org/grpc v1.78.0
1111
google.golang.org/protobuf v1.36.11
1212
k8s.io/apimachinery v0.35.0
13-
sigs.k8s.io/controller-runtime v0.22.4
13+
sigs.k8s.io/controller-runtime v0.23.0
1414
sigs.k8s.io/gateway-api v1.4.1
15-
sigs.k8s.io/gateway-api-inference-extension v1.2.1
15+
sigs.k8s.io/gateway-api-inference-extension v1.3.0
1616
)
1717

1818
require (
@@ -45,12 +45,12 @@ require (
4545
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
4646
go.yaml.in/yaml/v2 v2.4.3 // indirect
4747
go.yaml.in/yaml/v3 v3.0.4 // indirect
48-
golang.org/x/mod v0.30.0 // indirect
49-
golang.org/x/net v0.48.0 // indirect
48+
golang.org/x/mod v0.32.0 // indirect
49+
golang.org/x/net v0.49.0 // indirect
5050
golang.org/x/sync v0.19.0 // indirect
51-
golang.org/x/sys v0.39.0 // indirect
52-
golang.org/x/text v0.32.0 // indirect
53-
golang.org/x/tools v0.39.0 // indirect
51+
golang.org/x/sys v0.40.0 // indirect
52+
golang.org/x/text v0.33.0 // indirect
53+
golang.org/x/tools v0.40.0 // indirect
5454
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
5555
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
5656
gopkg.in/inf.v0 v0.9.1 // indirect
@@ -66,7 +66,7 @@ require (
6666
sigs.k8s.io/controller-tools v0.19.0 // indirect
6767
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
6868
sigs.k8s.io/randfill v1.0.0 // indirect
69-
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
69+
sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect
7070
sigs.k8s.io/yaml v1.6.0 // indirect
7171
)
7272

0 commit comments

Comments
 (0)