Skip to content

Commit d6a3d34

Browse files
[protobuf] Update protobuf definitions to v1.25.0 (#269)
Signed-off-by: envoy-bot <[email protected]> Signed-off-by: envoy-bot <[email protected]> Co-authored-by: envoy-bot <[email protected]>
1 parent 1692741 commit d6a3d34

File tree

71 files changed

+1258
-98
lines changed

Some content is hidden

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

71 files changed

+1258
-98
lines changed

api/src/main/proto/envoy/admin/v3/config_dump.proto

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ message ConfigDump {
3232
//
3333
// * ``bootstrap``: :ref:`BootstrapConfigDump <envoy_v3_api_msg_admin.v3.BootstrapConfigDump>`
3434
// * ``clusters``: :ref:`ClustersConfigDump <envoy_v3_api_msg_admin.v3.ClustersConfigDump>`
35+
// * ``ecds_filter_http``: :ref:`EcdsConfigDump <envoy_v3_api_msg_admin.v3.EcdsConfigDump>`
36+
// * ``ecds_filter_tcp_listener``: :ref:`EcdsConfigDump <envoy_v3_api_msg_admin.v3.EcdsConfigDump>`
3537
// * ``endpoints``: :ref:`EndpointsConfigDump <envoy_v3_api_msg_admin.v3.EndpointsConfigDump>`
3638
// * ``listeners``: :ref:`ListenersConfigDump <envoy_v3_api_msg_admin.v3.ListenersConfigDump>`
3739
// * ``scoped_routes``: :ref:`ScopedRoutesConfigDump <envoy_v3_api_msg_admin.v3.ScopedRoutesConfigDump>`
@@ -40,6 +42,9 @@ message ConfigDump {
4042
//
4143
// EDS Configuration will only be dumped by using parameter ``?include_eds``
4244
//
45+
// Currently ECDS is supported in HTTP and listener filters. Note, ECDS configuration for
46+
// either HTTP or listener filter will only be dumped if it is actually configured.
47+
//
4348
// You can filter output with the resource and mask query parameters.
4449
// See :ref:`/config_dump?resource={} <operations_admin_interface_config_dump_by_resource>`,
4550
// :ref:`/config_dump?mask={} <operations_admin_interface_config_dump_by_mask>`,

api/src/main/proto/envoy/admin/v3/config_dump_shared.proto

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,3 +370,43 @@ message EndpointsConfigDump {
370370
// The dynamically loaded endpoint configs.
371371
repeated DynamicEndpointConfig dynamic_endpoint_configs = 3;
372372
}
373+
374+
// Envoy's ECDS service fills this message with all currently extension
375+
// configuration. Extension configuration information can be used to recreate
376+
// an Envoy ECDS listener and HTTP filters as static filters or by returning
377+
// them in ECDS response.
378+
message EcdsConfigDump {
379+
option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v2alpha.EcdsConfigDump";
380+
381+
// [#next-free-field: 6]
382+
message EcdsFilterConfig {
383+
option (udpa.annotations.versioning).previous_message_type =
384+
"envoy.admin.v2alpha.EcdsConfigDump.EcdsFilterConfig";
385+
386+
// This is the per-resource version information. This version is currently
387+
// taken from the :ref:`version_info
388+
// <envoy_v3_api_field_service.discovery.v3.DiscoveryResponse.version_info>`
389+
// field at the time that the ECDS filter was loaded.
390+
string version_info = 1;
391+
392+
// The ECDS filter config.
393+
google.protobuf.Any ecds_filter = 2;
394+
395+
// The timestamp when the ECDS filter was last updated.
396+
google.protobuf.Timestamp last_updated = 3;
397+
398+
// Set if the last update failed, cleared after the next successful update.
399+
// The ``error_state`` field contains the rejected version of this
400+
// particular resource along with the reason and timestamp. For successfully
401+
// updated or acknowledged resource, this field should be empty.
402+
// [#not-implemented-hide:]
403+
UpdateFailureState error_state = 4;
404+
405+
// The client status of this resource.
406+
// [#not-implemented-hide:]
407+
ClientResourceStatus client_status = 5;
408+
}
409+
410+
// The ECDS filter configs.
411+
repeated EcdsFilterConfig ecds_filters = 1;
412+
}

api/src/main/proto/envoy/api/v2/core/grpc_service.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ message GrpcService {
100100
message StsService {
101101
// URI of the token exchange service that handles token exchange requests.
102102
// [#comment:TODO(asraa): Add URI validation when implemented. Tracked by
103-
// https://github.com/envoyproxy/protoc-gen-validate/issues/303]
103+
// https://github.com/bufbuild/protoc-gen-validate/issues/303]
104104
string token_exchange_service_uri = 1;
105105

106106
// Location of the target service or resource where the client

api/src/main/proto/envoy/config/bootstrap/v3/bootstrap.proto

Lines changed: 13 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: 36]
44+
// [#next-free-field: 37]
4545
message Bootstrap {
4646
option (udpa.annotations.versioning).previous_message_type =
4747
"envoy.config.bootstrap.v2.Bootstrap";
@@ -342,6 +342,18 @@ message Bootstrap {
342342
// TODO(abeyad): Add public-facing documentation.
343343
// [#not-implemented-hide:]
344344
core.v3.TypedExtensionConfig xds_delegate_extension = 35;
345+
346+
// Optional XdsConfigTracker configuration, which allows tracking xDS responses in external components,
347+
// e.g., external tracer or monitor. It provides the process point when receive, ingest, or fail to
348+
// process xDS resources and messages. If a value is not specified, no XdsConfigTracker will be used.
349+
//
350+
// .. note::
351+
//
352+
// There are no in-repo extensions currently, and the :repo:`XdsConfigTracker <envoy/config/xds_config_tracker.h>`
353+
// interface should be implemented before using.
354+
// See :repo:`xds_config_tracker_integration_test <test/integration/xds_config_tracker_integration_test.cc>`
355+
// for an example usage of the interface.
356+
core.v3.TypedExtensionConfig xds_config_tracker_extension = 36;
345357
}
346358

347359
// Administration interface :ref:`operations documentation

api/src/main/proto/envoy/config/cluster/v3/cluster.proto

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,7 @@ message Cluster {
525525
// Specific configuration for the
526526
// :ref:`Original Destination <arch_overview_load_balancing_types_original_destination>`
527527
// load balancing policy.
528+
// [#extension: envoy.clusters.original_dst]
528529
message OriginalDstLbConfig {
529530
option (udpa.annotations.versioning).previous_message_type =
530531
"envoy.api.v2.Cluster.OriginalDstLbConfig";
@@ -1215,6 +1216,7 @@ message LoadBalancingPolicy {
12151216

12161217
reserved "config", "name", "typed_config";
12171218

1219+
// [#extension-category: envoy.load_balancing_policies]
12181220
core.v3.TypedExtensionConfig typed_extension_config = 4;
12191221
}
12201222

api/src/main/proto/envoy/config/common/mutation_rules/v3/mutation_rules.proto

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ syntax = "proto3";
22

33
package envoy.config.common.mutation_rules.v3;
44

5+
import "envoy/config/core/v3/base.proto";
56
import "envoy/type/matcher/v3/regex.proto";
67

78
import "google/protobuf/wrappers.proto";
89

910
import "udpa/annotations/status.proto";
11+
import "validate/validate.proto";
1012

1113
option java_package = "io.envoyproxy.envoy.config.common.mutation_rules.v3";
1214
option java_outer_classname = "MutationRulesProto";
@@ -84,3 +86,18 @@ message HeaderMutationRules {
8486
// Default is false.
8587
google.protobuf.BoolValue disallow_is_error = 7;
8688
}
89+
90+
// The HeaderMutation structure specifies an action that may be taken on HTTP
91+
// headers.
92+
message HeaderMutation {
93+
oneof action {
94+
option (validate.required) = true;
95+
96+
// Remove the specified header if it exists.
97+
string remove = 1
98+
[(validate.rules).string = {well_known_regex: HTTP_HEADER_VALUE strict: false}];
99+
100+
// Append new header by the specified HeaderValueOption.
101+
core.v3.HeaderValueOption append = 2;
102+
}
103+
}

api/src/main/proto/envoy/config/core/v3/address.proto

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ message ExtraSourceAddress {
120120
// The additional address to bind.
121121
SocketAddress address = 1 [(validate.rules).message = {required: true}];
122122

123-
// [#not-implemented-hide:]
124123
// Additional socket options that may not be present in Envoy source code or
125124
// precompiled binaries. If specified, this will override the
126125
// :ref:`socket_options <envoy_v3_api_field_config.core.v3.BindConfig.socket_options>`
@@ -136,7 +135,7 @@ message BindConfig {
136135
option (udpa.annotations.versioning).previous_message_type = "envoy.api.v2.core.BindConfig";
137136

138137
// The address to bind to when creating a socket.
139-
SocketAddress source_address = 1 [(validate.rules).message = {required: true}];
138+
SocketAddress source_address = 1;
140139

141140
// Whether to set the ``IP_FREEBIND`` option when creating the socket. When this
142141
// flag is set to true, allows the :ref:`source_address

api/src/main/proto/envoy/config/core/v3/grpc_service.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ message GrpcService {
142142

143143
// URI of the token exchange service that handles token exchange requests.
144144
// [#comment:TODO(asraa): Add URI validation when implemented. Tracked by
145-
// https://github.com/envoyproxy/protoc-gen-validate/issues/303]
145+
// https://github.com/bufbuild/protoc-gen-validate/issues/303]
146146
string token_exchange_service_uri = 1;
147147

148148
// Location of the target service or resource where the client

api/src/main/proto/envoy/config/core/v3/socket_option.proto

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ message SocketOption {
7676
SocketState state = 6 [(validate.rules).enum = {defined_only: true}];
7777
}
7878

79-
// [#not-implemented-hide:]
8079
message SocketOptionsOverride {
8180
repeated SocketOption socket_options = 1;
8281
}

api/src/main/proto/envoy/config/endpoint/v3/endpoint_components.proto

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ message Endpoint {
5151
//
5252
// The form of the health check host address is expected to be a direct IP address.
5353
core.v3.Address address = 3;
54+
55+
// Optional flag to control if perform active health check for this endpoint.
56+
// Active health check is enabled by default if there is a health checker.
57+
bool disable_active_health_check = 4;
5458
}
5559

5660
// The upstream host address.

0 commit comments

Comments
 (0)