Skip to content

Commit 6c33602

Browse files
authored
chore: Update protobuf files (#30)
* envoy-proto-collect: update submodules * envoy-types: collect updated protos * envoy-types: update generated files
1 parent 1aaf170 commit 6c33602

File tree

125 files changed

+4987
-745
lines changed

Some content is hidden

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

125 files changed

+4987
-745
lines changed
Submodule data-plane-api updated 120 files
Submodule googleapis updated 310 files

envoy-types/proto/data-plane-api/envoy/admin/v3/server_info.proto

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ message ServerInfo {
7373
config.core.v3.Node node = 7;
7474
}
7575

76-
// [#next-free-field: 42]
76+
// [#next-free-field: 43]
7777
message CommandLineOptions {
7878
option (udpa.annotations.versioning).previous_message_type =
7979
"envoy.admin.v2alpha.CommandLineOptions";
@@ -175,6 +175,9 @@ message CommandLineOptions {
175175
// See :option:`--file-flush-interval-msec` for details.
176176
google.protobuf.Duration file_flush_interval = 16;
177177

178+
// See :option:`--file-flush-min-size-kb` for details.
179+
uint32 file_flush_min_size = 42;
180+
178181
// See :option:`--drain-time-s` for details.
179182
google.protobuf.Duration drain_time = 17;
180183

envoy-types/proto/data-plane-api/envoy/config/bootstrap/v3/bootstrap.proto

Lines changed: 108 additions & 79 deletions
Large diffs are not rendered by default.

envoy-types/proto/data-plane-api/envoy/config/cluster/v3/cluster.proto

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import "google/protobuf/struct.proto";
3636
import "google/protobuf/wrappers.proto";
3737

3838
import "xds/core/v3/collection_entry.proto";
39+
import "xds/type/matcher/v3/matcher.proto";
3940

4041
import "envoy/annotations/deprecation.proto";
4142
import "udpa/annotations/migrate.proto";
@@ -59,7 +60,7 @@ message ClusterCollection {
5960
}
6061

6162
// Configuration for a single upstream cluster.
62-
// [#next-free-field: 59]
63+
// [#next-free-field: 60]
6364
message Cluster {
6465
option (udpa.annotations.versioning).previous_message_type = "envoy.api.v2.Cluster";
6566

@@ -761,6 +762,9 @@ message Cluster {
761762
// If both this and preconnect_ratio are set, Envoy will make sure both predicted needs are met,
762763
// basically preconnecting max(predictive-preconnect, per-upstream-preconnect), for each
763764
// upstream.
765+
//
766+
// This is limited somewhat arbitrarily to 3 because preconnecting too aggressively can
767+
// harm latency more than the preconnecting helps.
764768
google.protobuf.DoubleValue predictive_preconnect_ratio = 2
765769
[(validate.rules).double = {lte: 3.0 gte: 1.0}];
766770
}
@@ -823,6 +827,41 @@ message Cluster {
823827
// [#comment:TODO(incfly): add a detailed architecture doc on intended usage.]
824828
repeated TransportSocketMatch transport_socket_matches = 43;
825829

830+
// Optional matcher that selects a transport socket from
831+
// :ref:`transport_socket_matches <envoy_v3_api_field_config.cluster.v3.Cluster.transport_socket_matches>`.
832+
//
833+
// This matcher uses the generic xDS matcher framework to select a named transport socket
834+
// based on various inputs available at transport socket selection time.
835+
//
836+
// Supported matching inputs:
837+
//
838+
// * ``endpoint_metadata``: Extract values from the selected endpoint's metadata.
839+
// * ``locality_metadata``: Extract values from the endpoint's locality metadata.
840+
// * ``transport_socket_filter_state``: Extract values from filter state that was explicitly shared from
841+
// downstream to upstream via ``TransportSocketOptions``. This enables flexible
842+
// downstream-connection-based matching, such as:
843+
//
844+
// - Network namespace matching.
845+
// - Custom connection attributes.
846+
// - Any data explicitly passed via filter state.
847+
//
848+
// .. note::
849+
// Filter state sharing follows the same pattern as tunneling in Envoy. Filters must explicitly
850+
// share data by setting filter state with the appropriate sharing mode. The filter state is
851+
// then accessible via the ``transport_socket_filter_state`` input during transport socket selection.
852+
//
853+
// If this field is set, it takes precedence over legacy metadata-based selection
854+
// performed by :ref:`transport_socket_matches
855+
// <envoy_v3_api_field_config.cluster.v3.Cluster.transport_socket_matches>` alone.
856+
// If the matcher does not yield a match, Envoy uses the default transport socket
857+
// configured for the cluster.
858+
//
859+
// When using this field, each entry in
860+
// :ref:`transport_socket_matches <envoy_v3_api_field_config.cluster.v3.Cluster.transport_socket_matches>`
861+
// must have a unique ``name``. The matcher outcome is expected to reference one of
862+
// these names.
863+
xds.type.matcher.v3.Matcher transport_socket_matcher = 59;
864+
826865
// Supplies the name of the cluster which must be unique across all clusters.
827866
// The cluster name is used when emitting
828867
// :ref:`statistics <config_cluster_manager_cluster_stats>` if :ref:`alt_stat_name

envoy-types/proto/data-plane-api/envoy/config/core/v3/address.proto

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,16 +129,18 @@ message TcpKeepalive {
129129

130130
// Maximum number of keepalive probes to send without response before deciding
131131
// the connection is dead. Default is to use the OS level configuration (unless
132-
// overridden, Linux defaults to 9.)
132+
// overridden, Linux defaults to 9.) Setting this to ``0`` disables TCP keepalive.
133133
google.protobuf.UInt32Value keepalive_probes = 1;
134134

135135
// The number of seconds a connection needs to be idle before keep-alive probes
136136
// start being sent. Default is to use the OS level configuration (unless
137-
// overridden, Linux defaults to 7200s (i.e., 2 hours.)
137+
// overridden, Linux defaults to 7200s (i.e., 2 hours.) Setting this to ``0`` disables
138+
// TCP keepalive.
138139
google.protobuf.UInt32Value keepalive_time = 2;
139140

140141
// The number of seconds between keep-alive probes. Default is to use the OS
141-
// level configuration (unless overridden, Linux defaults to 75s.)
142+
// level configuration (unless overridden, Linux defaults to 75s.) Setting this to
143+
// ``0`` disables TCP keepalive.
142144
google.protobuf.UInt32Value keepalive_interval = 3;
143145
}
144146

0 commit comments

Comments
 (0)