Skip to content

Commit 96a788a

Browse files
sergiitksergiitk
authored
xds: Envoy proto sync to 2024-07-06 (#11401)
`envoyproxy/envoy`: Sync protos to the latest imported version envoyproxy/envoy@ab911ac (commit 2024-07-06, cl/651956889). Should be a noop, just a routine xDS proto update to make upcoming RLQS-related imports simpler.
1 parent 9ba2f9d commit 96a788a

File tree

28 files changed

+419
-130
lines changed

28 files changed

+419
-130
lines changed

‎buildscripts/data-plane-api-no-envoy.patch‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎repositories.bzl‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,11 @@ def grpc_java_repositories(bzlmod = False):
130130
if not native.existing_rule("envoy_api"):
131131
http_archive(
132132
name = "envoy_api",
133-
sha256 = "c4c9c43903e413924b0cb08e9747f3c3a0727ad221a3c446a326db32def18c60",
134-
strip_prefix = "data-plane-api-1611a7304794e13efe2d26f8480a2d2473a528c5",
133+
sha256 = "cb7cd388eaa297320d392c872ceb82571dee71f4b6f1c4546b0c0a399636f523",
134+
strip_prefix = "data-plane-api-874e3aa8c3aa5086b6bffa2166e0e0077bb32f71",
135135
urls = [
136-
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/1611a7304794e13efe2d26f8480a2d2473a528c5.tar.gz",
137-
"https://github.com/envoyproxy/data-plane-api/archive/1611a7304794e13efe2d26f8480a2d2473a528c5.tar.gz",
136+
"https://github.com/envoyproxy/data-plane-api/archive/874e3aa8c3aa5086b6bffa2166e0e0077bb32f71.tar.gz",
138137
],
139-
patch_args = ["-p1"],
140-
patches = ["@io_grpc_grpc_java//:buildscripts/data-plane-api-no-envoy.patch"],
141138
)
142139

143140
def com_google_protobuf():

‎xds/third_party/envoy/import.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
set -e
1919
# import VERSION from the google internal copybara_version.txt for Envoy
20-
VERSION=147e6b9523d8d2ae0d9d2205254d6e633644c6fe
20+
VERSION=ab911ac2ff971f805ec822ad4d4ff6b42a61cc7c
2121
DOWNLOAD_URL="https://github.com/envoyproxy/envoy/archive/${VERSION}.tar.gz"
2222
DOWNLOAD_BASE_DIR="envoy-${VERSION}"
2323
SOURCE_PROTO_BASE_DIR="${DOWNLOAD_BASE_DIR}/api"

‎xds/third_party/envoy/src/main/proto/envoy/config/accesslog/v3/accesslog.proto‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ message ResponseFlagFilter {
256256
in: "OM"
257257
in: "DF"
258258
in: "DO"
259+
in: "DR"
259260
}
260261
}
261262
}];

‎xds/third_party/envoy/src/main/proto/envoy/config/bootstrap/v3/bootstrap.proto‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
4141
// <config_overview_bootstrap>` for more detail.
4242

4343
// Bootstrap :ref:`configuration overview <config_overview_bootstrap>`.
44-
// [#next-free-field: 41]
44+
// [#next-free-field: 42]
4545
message Bootstrap {
4646
option (udpa.annotations.versioning).previous_message_type =
4747
"envoy.config.bootstrap.v2.Bootstrap";
@@ -411,6 +411,10 @@ message Bootstrap {
411411

412412
// Optional gRPC async manager config.
413413
GrpcAsyncClientManagerConfig grpc_async_client_manager_config = 40;
414+
415+
// Optional configuration for memory allocation manager.
416+
// Memory releasing is only supported for `tcmalloc allocator <https://github.com/google/tcmalloc>`_.
417+
MemoryAllocatorManager memory_allocator_manager = 41;
414418
}
415419

416420
// Administration interface :ref:`operations documentation
@@ -734,3 +738,14 @@ message CustomInlineHeader {
734738
// The type of the header that is expected to be set as the inline header.
735739
InlineHeaderType inline_header_type = 2 [(validate.rules).enum = {defined_only: true}];
736740
}
741+
742+
message MemoryAllocatorManager {
743+
// Configures tcmalloc to perform background release of free memory in amount of bytes per ``memory_release_interval`` interval.
744+
// If equals to ``0``, no memory release will occur. Defaults to ``0``.
745+
uint64 bytes_to_release = 1;
746+
747+
// Interval in milliseconds for memory releasing. If specified, during every
748+
// interval Envoy will try to release ``bytes_to_release`` of free memory back to operating system for reuse.
749+
// Defaults to 1000 milliseconds.
750+
google.protobuf.Duration memory_release_interval = 2;
751+
}

‎xds/third_party/envoy/src/main/proto/envoy/config/cluster/v3/cluster.proto‎

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ message Cluster {
168168
// The name of the match, used in stats generation.
169169
string name = 1 [(validate.rules).string = {min_len: 1}];
170170

171-
// Optional endpoint metadata match criteria.
171+
// Optional metadata match criteria.
172172
// The connection to the endpoint with metadata matching what is set in this field
173173
// will use the transport socket configuration specified here.
174174
// The endpoint's metadata entry in ``envoy.transport_socket_match`` is used to match
@@ -754,12 +754,14 @@ message Cluster {
754754

755755
reserved "hosts", "tls_context", "extension_protocol_options";
756756

757-
// Configuration to use different transport sockets for different endpoints.
758-
// The entry of ``envoy.transport_socket_match`` in the
759-
// :ref:`LbEndpoint.Metadata <envoy_v3_api_field_config.endpoint.v3.LbEndpoint.metadata>`
760-
// is used to match against the transport sockets as they appear in the list. The first
761-
// :ref:`match <envoy_v3_api_msg_config.cluster.v3.Cluster.TransportSocketMatch>` is used.
762-
// For example, with the following match
757+
// Configuration to use different transport sockets for different endpoints. The entry of
758+
// ``envoy.transport_socket_match`` in the :ref:`LbEndpoint.Metadata
759+
// <envoy_v3_api_field_config.endpoint.v3.LbEndpoint.metadata>` is used to match against the
760+
// transport sockets as they appear in the list. If a match is not found, the search continues in
761+
// :ref:`LocalityLbEndpoints.Metadata
762+
// <envoy_v3_api_field_config.endpoint.v3.LocalityLbEndpoints.metadata>`. The first :ref:`match
763+
// <envoy_v3_api_msg_config.cluster.v3.Cluster.TransportSocketMatch>` is used. For example, with
764+
// the following match
763765
//
764766
// .. code-block:: yaml
765767
//
@@ -783,8 +785,9 @@ message Cluster {
783785
// socket match in case above.
784786
//
785787
// If an endpoint metadata's value under ``envoy.transport_socket_match`` does not match any
786-
// ``TransportSocketMatch``, socket configuration fallbacks to use the ``tls_context`` or
787-
// ``transport_socket`` specified in this cluster.
788+
// ``TransportSocketMatch``, the locality metadata is then checked for a match. Barring any
789+
// matches in the endpoint or locality metadata, the socket configuration fallbacks to use the
790+
// ``tls_context`` or ``transport_socket`` specified in this cluster.
788791
//
789792
// This field allows gradual and flexible transport socket configuration changes.
790793
//
@@ -1236,13 +1239,38 @@ message UpstreamConnectionOptions {
12361239
option (udpa.annotations.versioning).previous_message_type =
12371240
"envoy.api.v2.UpstreamConnectionOptions";
12381241

1242+
enum FirstAddressFamilyVersion {
1243+
// respect the native ranking of destination ip addresses returned from dns
1244+
// resolution
1245+
DEFAULT = 0;
1246+
1247+
V4 = 1;
1248+
1249+
V6 = 2;
1250+
}
1251+
1252+
message HappyEyeballsConfig {
1253+
// Specify the IP address family to attempt connection first in happy
1254+
// eyeballs algorithm according to RFC8305#section-4.
1255+
FirstAddressFamilyVersion first_address_family_version = 1;
1256+
1257+
// Specify the number of addresses of the first_address_family_version being
1258+
// attempted for connection before the other address family.
1259+
google.protobuf.UInt32Value first_address_family_count = 2 [(validate.rules).uint32 = {gte: 1}];
1260+
}
1261+
12391262
// If set then set SO_KEEPALIVE on the socket to enable TCP Keepalives.
12401263
core.v3.TcpKeepalive tcp_keepalive = 1;
12411264

12421265
// If enabled, associates the interface name of the local address with the upstream connection.
12431266
// This can be used by extensions during processing of requests. The association mechanism is
12441267
// implementation specific. Defaults to false due to performance concerns.
12451268
bool set_local_interface_name_on_upstream_connections = 2;
1269+
1270+
// Configurations for happy eyeballs algorithm.
1271+
// Add configs for first_address_family_version and first_address_family_count
1272+
// when sorting destination ip addresses.
1273+
HappyEyeballsConfig happy_eyeballs_config = 3;
12461274
}
12471275

12481276
message TrackClusterStats {

‎xds/third_party/envoy/src/main/proto/envoy/config/cluster/v3/outlier_detection.proto‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ syntax = "proto3";
22

33
package envoy.config.cluster.v3;
44

5+
import "envoy/config/core/v3/extension.proto";
6+
57
import "google/protobuf/duration.proto";
68
import "google/protobuf/wrappers.proto";
79

@@ -19,7 +21,7 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
1921

2022
// See the :ref:`architecture overview <arch_overview_outlier_detection>` for
2123
// more information on outlier detection.
22-
// [#next-free-field: 24]
24+
// [#next-free-field: 26]
2325
message OutlierDetection {
2426
option (udpa.annotations.versioning).previous_message_type =
2527
"envoy.api.v2.cluster.OutlierDetection";
@@ -40,8 +42,8 @@ message OutlierDetection {
4042
// Defaults to 30000ms or 30s.
4143
google.protobuf.Duration base_ejection_time = 3 [(validate.rules).duration = {gt {}}];
4244

43-
// The maximum % of an upstream cluster that can be ejected due to outlier
44-
// detection. Defaults to 10% but will eject at least one host regardless of the value.
45+
// The maximum % of an upstream cluster that can be ejected due to outlier detection. Defaults to 10% .
46+
// Will eject at least one host regardless of the value if :ref:`always_eject_one_host<envoy_v3_api_field_config.cluster.v3.OutlierDetection.always_eject_one_host>` is enabled.
4547
google.protobuf.UInt32Value max_ejection_percent = 4 [(validate.rules).uint32 = {lte: 100}];
4648

4749
// The % chance that a host will be actually ejected when an outlier status
@@ -167,4 +169,12 @@ message OutlierDetection {
167169
// To change this default behavior set this config to ``false`` where active health checking will not uneject the host.
168170
// Defaults to true.
169171
google.protobuf.BoolValue successful_active_health_check_uneject_host = 23;
172+
173+
// Set of host's passive monitors.
174+
// [#not-implemented-hide:]
175+
repeated core.v3.TypedExtensionConfig monitors = 24;
176+
177+
// If enabled, at least one host is ejected regardless of the value of :ref:`max_ejection_percent<envoy_v3_api_field_config.cluster.v3.OutlierDetection.max_ejection_percent>`.
178+
// Defaults to false.
179+
google.protobuf.BoolValue always_eject_one_host = 25;
170180
}

‎xds/third_party/envoy/src/main/proto/envoy/config/core/v3/base.proto‎

Lines changed: 105 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,15 +245,17 @@ message Metadata {
245245
// :ref:`typed_filter_metadata <envoy_v3_api_field_config.core.v3.Metadata.typed_filter_metadata>`
246246
// fields are present in the metadata with same keys,
247247
// only ``typed_filter_metadata`` field will be parsed.
248-
map<string, google.protobuf.Struct> filter_metadata = 1;
248+
map<string, google.protobuf.Struct> filter_metadata = 1
249+
[(validate.rules).map = {keys {string {min_len: 1}}}];
249250

250251
// Key is the reverse DNS filter name, e.g. com.acme.widget. The ``envoy.*``
251252
// namespace is reserved for Envoy's built-in filters.
252253
// The value is encoded as google.protobuf.Any.
253254
// If both :ref:`filter_metadata <envoy_v3_api_field_config.core.v3.Metadata.filter_metadata>`
254255
// and ``typed_filter_metadata`` fields are present in the metadata with same keys,
255256
// only ``typed_filter_metadata`` field will be parsed.
256-
map<string, google.protobuf.Any> typed_filter_metadata = 2;
257+
map<string, google.protobuf.Any> typed_filter_metadata = 2
258+
[(validate.rules).map = {keys {string {min_len: 1}}}];
257259
}
258260

259261
// Runtime derived uint32 with a default when not specified.
@@ -301,6 +303,59 @@ message RuntimeFeatureFlag {
301303
string runtime_key = 2 [(validate.rules).string = {min_len: 1}];
302304
}
303305

306+
message KeyValue {
307+
// The key of the key/value pair.
308+
string key = 1 [(validate.rules).string = {min_len: 1 max_bytes: 16384}];
309+
310+
// The value of the key/value pair.
311+
bytes value = 2;
312+
}
313+
314+
// Key/value pair plus option to control append behavior. This is used to specify
315+
// key/value pairs that should be appended to a set of existing key/value pairs.
316+
message KeyValueAppend {
317+
// Describes the supported actions types for key/value pair append action.
318+
enum KeyValueAppendAction {
319+
// If the key already exists, this action will result in the following behavior:
320+
//
321+
// - Comma-concatenated value if multiple values are not allowed.
322+
// - New value added to the list of values if multiple values are allowed.
323+
//
324+
// If the key doesn't exist then this will add pair with specified key and value.
325+
APPEND_IF_EXISTS_OR_ADD = 0;
326+
327+
// This action will add the key/value pair if it doesn't already exist. If the
328+
// key already exists then this will be a no-op.
329+
ADD_IF_ABSENT = 1;
330+
331+
// This action will overwrite the specified value by discarding any existing
332+
// values if the key already exists. If the key doesn't exist then this will add
333+
// the pair with specified key and value.
334+
OVERWRITE_IF_EXISTS_OR_ADD = 2;
335+
336+
// This action will overwrite the specified value by discarding any existing
337+
// values if the key already exists. If the key doesn't exist then this will
338+
// be no-op.
339+
OVERWRITE_IF_EXISTS = 3;
340+
}
341+
342+
// Key/value pair entry that this option to append or overwrite.
343+
KeyValue entry = 1 [(validate.rules).message = {required: true}];
344+
345+
// Describes the action taken to append/overwrite the given value for an existing
346+
// key or to only add this key if it's absent.
347+
KeyValueAppendAction action = 2 [(validate.rules).enum = {defined_only: true}];
348+
}
349+
350+
// Key/value pair to append or remove.
351+
message KeyValueMutation {
352+
// Key/value pair to append or overwrite. Only one of ``append`` or ``remove`` can be set.
353+
KeyValueAppend append = 1;
354+
355+
// Key to remove. Only one of ``append`` or ``remove`` can be set.
356+
string remove = 2 [(validate.rules).string = {max_bytes: 16384}];
357+
}
358+
304359
// Query parameter name/value pair.
305360
message QueryParameter {
306361
// The key of the query parameter. Case sensitive.
@@ -409,6 +464,7 @@ message WatchedDirectory {
409464
}
410465

411466
// Data source consisting of a file, an inline value, or an environment variable.
467+
// [#next-free-field: 6]
412468
message DataSource {
413469
option (udpa.annotations.versioning).previous_message_type = "envoy.api.v2.core.DataSource";
414470

@@ -427,12 +483,47 @@ message DataSource {
427483
// Environment variable data source.
428484
string environment_variable = 4 [(validate.rules).string = {min_len: 1}];
429485
}
486+
487+
// Watched directory that is watched for file changes. If this is set explicitly, the file
488+
// specified in the ``filename`` field will be reloaded when relevant file move events occur.
489+
//
490+
// .. note::
491+
// This field only makes sense when the ``filename`` field is set.
492+
//
493+
// .. note::
494+
// Envoy only updates when the file is replaced by a file move, and not when the file is
495+
// edited in place.
496+
//
497+
// .. note::
498+
// Not all use cases of ``DataSource`` support watching directories. It depends on the
499+
// specific usage of the ``DataSource``. See the documentation of the parent message for
500+
// details.
501+
WatchedDirectory watched_directory = 5;
430502
}
431503

432504
// The message specifies the retry policy of remote data source when fetching fails.
505+
// [#next-free-field: 7]
433506
message RetryPolicy {
434507
option (udpa.annotations.versioning).previous_message_type = "envoy.api.v2.core.RetryPolicy";
435508

509+
// See :ref:`RetryPriority <envoy_v3_api_field_config.route.v3.RetryPolicy.retry_priority>`.
510+
message RetryPriority {
511+
string name = 1 [(validate.rules).string = {min_len: 1}];
512+
513+
oneof config_type {
514+
google.protobuf.Any typed_config = 2;
515+
}
516+
}
517+
518+
// See :ref:`RetryHostPredicate <envoy_v3_api_field_config.route.v3.RetryPolicy.retry_host_predicate>`.
519+
message RetryHostPredicate {
520+
string name = 1 [(validate.rules).string = {min_len: 1}];
521+
522+
oneof config_type {
523+
google.protobuf.Any typed_config = 2;
524+
}
525+
}
526+
436527
// Specifies parameters that control :ref:`retry backoff strategy <envoy_v3_api_msg_config.core.v3.BackoffStrategy>`.
437528
// This parameter is optional, in which case the default base interval is 1000 milliseconds. The
438529
// default maximum interval is 10 times the base interval.
@@ -442,6 +533,18 @@ message RetryPolicy {
442533
// defaults to 1.
443534
google.protobuf.UInt32Value num_retries = 2
444535
[(udpa.annotations.field_migrate).rename = "max_retries"];
536+
537+
// For details, see :ref:`retry_on <envoy_v3_api_field_config.route.v3.RetryPolicy.retry_on>`.
538+
string retry_on = 3;
539+
540+
// For details, see :ref:`retry_priority <envoy_v3_api_field_config.route.v3.RetryPolicy.retry_priority>`.
541+
RetryPriority retry_priority = 4;
542+
543+
// For details, see :ref:`RetryHostPredicate <envoy_v3_api_field_config.route.v3.RetryPolicy.retry_host_predicate>`.
544+
repeated RetryHostPredicate retry_host_predicate = 5;
545+
546+
// For details, see :ref:`host_selection_retry_max_attempts <envoy_v3_api_field_config.route.v3.RetryPolicy.host_selection_retry_max_attempts>`.
547+
int64 host_selection_retry_max_attempts = 6;
445548
}
446549

447550
// The message specifies how to fetch data from remote and how to verify it.

0 commit comments

Comments
 (0)