Skip to content

Commit c6e3bf3

Browse files
[protobuf] Update protobuf definitions to v1.26.1 (#286)
Signed-off-by: envoy-bot <[email protected]> Co-authored-by: envoy-bot <[email protected]>
1 parent d0a662e commit c6e3bf3

File tree

106 files changed

+888
-220
lines changed

Some content is hidden

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

106 files changed

+888
-220
lines changed

api/src/main/proto/envoy/api/v2/cds.proto

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ option java_package = "io.envoyproxy.envoy.api.v2";
1616
option java_outer_classname = "CdsProto";
1717
option java_multiple_files = true;
1818
option go_package = "github.com/envoyproxy/go-control-plane/envoy/api/v2;apiv2";
19-
option java_generic_services = true;
2019
option (udpa.annotations.file_migrate).move_to_package = "envoy.service.cluster.v3";
2120
option (udpa.annotations.file_status).package_version_status = FROZEN;
2221

api/src/main/proto/envoy/api/v2/eds.proto

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ option java_package = "io.envoyproxy.envoy.api.v2";
1616
option java_outer_classname = "EdsProto";
1717
option java_multiple_files = true;
1818
option go_package = "github.com/envoyproxy/go-control-plane/envoy/api/v2;apiv2";
19-
option java_generic_services = true;
2019
option (udpa.annotations.file_migrate).move_to_package = "envoy.service.endpoint.v3";
2120
option (udpa.annotations.file_status).package_version_status = FROZEN;
2221

api/src/main/proto/envoy/api/v2/lds.proto

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ option java_package = "io.envoyproxy.envoy.api.v2";
1616
option java_outer_classname = "LdsProto";
1717
option java_multiple_files = true;
1818
option go_package = "github.com/envoyproxy/go-control-plane/envoy/api/v2;apiv2";
19-
option java_generic_services = true;
2019
option (udpa.annotations.file_migrate).move_to_package = "envoy.service.listener.v3";
2120
option (udpa.annotations.file_status).package_version_status = FROZEN;
2221

api/src/main/proto/envoy/api/v2/rds.proto

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ option java_package = "io.envoyproxy.envoy.api.v2";
1616
option java_outer_classname = "RdsProto";
1717
option java_multiple_files = true;
1818
option go_package = "github.com/envoyproxy/go-control-plane/envoy/api/v2;apiv2";
19-
option java_generic_services = true;
2019
option (udpa.annotations.file_migrate).move_to_package = "envoy.service.route.v3";
2120
option (udpa.annotations.file_status).package_version_status = FROZEN;
2221

api/src/main/proto/envoy/api/v2/route/route_components.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1265,7 +1265,7 @@ message Tracing {
12651265
// Target percentage of requests managed by this HTTP connection manager that will be force
12661266
// traced if the :ref:`x-client-trace-id <config_http_conn_man_headers_x-client-trace-id>`
12671267
// header is set. This field is a direct analog for the runtime variable
1268-
// 'tracing.client_sampling' in the :ref:`HTTP Connection Manager
1268+
// 'tracing.client_enabled' in the :ref:`HTTP Connection Manager
12691269
// <config_http_conn_man_runtime>`.
12701270
// Default: 100%
12711271
type.FractionalPercent client_sampling = 1;

api/src/main/proto/envoy/api/v2/srds.proto

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ option java_package = "io.envoyproxy.envoy.api.v2";
1616
option java_outer_classname = "SrdsProto";
1717
option java_multiple_files = true;
1818
option go_package = "github.com/envoyproxy/go-control-plane/envoy/api/v2;apiv2";
19-
option java_generic_services = true;
2019
option (udpa.annotations.file_migrate).move_to_package = "envoy.service.route.v3";
2120
option (udpa.annotations.file_status).package_version_status = FROZEN;
2221

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,10 @@ message StatusCodeFilter {
122122
ComparisonFilter comparison = 1 [(validate.rules).message = {required: true}];
123123
}
124124

125-
// Filters on total request duration in milliseconds.
125+
// Filters based on the duration of the request or stream, in milliseconds.
126+
// For end of stream access logs, the total duration of the stream will be used.
127+
// For :ref:`periodic access logs<arch_overview_access_log_periodic>`,
128+
// the duration of the stream at the time of log recording will be used.
126129
message DurationFilter {
127130
option (udpa.annotations.versioning).previous_message_type =
128131
"envoy.config.filter.accesslog.v2.DurationFilter";

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

Lines changed: 7 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: 37]
44+
// [#next-free-field: 38]
4545
message Bootstrap {
4646
option (udpa.annotations.versioning).previous_message_type =
4747
"envoy.config.bootstrap.v2.Bootstrap";
@@ -354,6 +354,12 @@ message Bootstrap {
354354
// See :repo:`xds_config_tracker_integration_test <test/integration/xds_config_tracker_integration_test.cc>`
355355
// for an example usage of the interface.
356356
core.v3.TypedExtensionConfig xds_config_tracker_extension = 36;
357+
358+
// [#not-implemented-hide:]
359+
// This controls the type of listener manager configured for Envoy. Currently
360+
// Envoy only supports ListenerManager for this field and Envoy Mobile
361+
// supports ApiListenerManager.
362+
core.v3.TypedExtensionConfig listener_manager = 37;
357363
}
358364

359365
// Administration interface :ref:`operations documentation

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,8 @@ message Cluster {
10101010

10111011
// Optional configuration for having cluster readiness block on warm-up. Currently, only applicable for
10121012
// :ref:`STRICT_DNS<envoy_v3_api_enum_value_config.cluster.v3.Cluster.DiscoveryType.STRICT_DNS>`,
1013-
// or :ref:`LOGICAL_DNS<envoy_v3_api_enum_value_config.cluster.v3.Cluster.DiscoveryType.LOGICAL_DNS>`.
1013+
// or :ref:`LOGICAL_DNS<envoy_v3_api_enum_value_config.cluster.v3.Cluster.DiscoveryType.LOGICAL_DNS>`,
1014+
// or :ref:`Redis Cluster<arch_overview_redis>`.
10141015
// If true, cluster readiness blocks on warm-up. If false, the cluster will complete
10151016
// initialization whether or not warm-up has completed. Defaults to true.
10161017
google.protobuf.BoolValue wait_for_warm_on_init = 54;

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,3 +281,15 @@ message ExtensionConfigSource {
281281
// if they do not match any type URL in the set.
282282
repeated string type_urls = 4 [(validate.rules).repeated = {min_items: 1}];
283283
}
284+
285+
// A placeholder proto for the registration for the REST subscription implementation.
286+
message RestSubscription {
287+
}
288+
289+
// A placeholder proto for the registration for the filesystem subscription implementation.
290+
message FilesystemSubscription {
291+
}
292+
293+
// A placeholder proto for the registration for the filesystem collection subscription implementation.
294+
message FilesystemCollectionSubscription {
295+
}

0 commit comments

Comments
 (0)