Skip to content

Commit 793fde8

Browse files
authored
xds: Import latest Envoy protos (#10167)
1 parent c16972c commit 793fde8

File tree

5 files changed

+43
-14
lines changed

5 files changed

+43
-14
lines changed

xds/third_party/envoy/import.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
set -e
1919
BRANCH=main
2020
# import VERSION from the google internal copybara_version.txt for Envoy
21-
VERSION=4a0b099ff8621ebf362516f730de522efbafcece
21+
VERSION=0478eba2a495027bf6ac8e787c42e2f5b9eb553b
2222
GIT_REPO="https://github.com/envoyproxy/envoy.git"
2323
GIT_BASE_DIR=envoy
2424
SOURCE_PROTO_BASE_DIR=envoy/api
@@ -134,6 +134,7 @@ envoy/extensions/filters/network/http_connection_manager/v3/http_connection_mana
134134
envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.proto
135135
envoy/extensions/load_balancing_policies/common/v3/common.proto
136136
envoy/extensions/load_balancing_policies/least_request/v3/least_request.proto
137+
envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.proto
137138
envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto
138139
envoy/extensions/load_balancing_policies/round_robin/v3/round_robin.proto
139140
envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.proto

xds/third_party/envoy/src/main/proto/envoy/config/core/v3/config_source.proto

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -281,15 +281,3 @@ 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-
}

xds/third_party/envoy/src/main/proto/envoy/config/core/v3/protocol.proto

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ message HttpProtocolOptions {
259259
google.protobuf.UInt32Value max_requests_per_connection = 6;
260260
}
261261

262-
// [#next-free-field: 10]
262+
// [#next-free-field: 11]
263263
message Http1ProtocolOptions {
264264
option (udpa.annotations.versioning).previous_message_type =
265265
"envoy.api.v2.core.Http1ProtocolOptions";
@@ -358,6 +358,19 @@ message Http1ProtocolOptions {
358358
// See issue #21245.
359359
google.protobuf.BoolValue use_balsa_parser = 9
360360
[(xds.annotations.v3.field_status).work_in_progress = true];
361+
362+
// [#not-implemented-hide:] Hiding so that field can be removed.
363+
// If true, and BalsaParser is used (either `use_balsa_parser` above is true,
364+
// or `envoy.reloadable_features.http1_use_balsa_parser` is true and
365+
// `use_balsa_parser` is unset), then every non-empty method with only valid
366+
// characters is accepted. Otherwise, methods not on the hard-coded list are
367+
// rejected.
368+
// Once UHV is enabled, this field should be removed, and BalsaParser should
369+
// allow any method. UHV validates the method, rejecting empty string or
370+
// invalid characters, and provides :ref:`restrict_http_methods
371+
// <envoy_v3_api_field_extensions.http.header_validators.envoy_default.v3.HeaderValidatorConfig.restrict_http_methods>`
372+
// to reject custom methods.
373+
bool allow_custom_methods = 10 [(xds.annotations.v3.field_status).work_in_progress = true];
361374
}
362375

363376
message KeepaliveSettings {

xds/third_party/envoy/src/main/proto/envoy/config/rbac/v3/rbac.proto

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,11 @@ message Principal {
320320

321321
// A CIDR block that describes the downstream IP.
322322
// This address will honor proxy protocol, but will not honor XFF.
323+
//
324+
// This field is deprecated; either use :ref:`direct_remote_ip
325+
// <envoy_v3_api_field_config.rbac.v3.Principal.direct_remote_ip>` for the same
326+
// behavior, or use
327+
// :ref:`remote_ip <envoy_v3_api_field_config.rbac.v3.Principal.remote_ip>`.
323328
core.v3.CidrRange source_ip = 5
324329
[deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"];
325330

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
syntax = "proto3";
2+
3+
package envoy.extensions.load_balancing_policies.pick_first.v3;
4+
5+
import "udpa/annotations/status.proto";
6+
7+
option java_package = "io.envoyproxy.envoy.extensions.load_balancing_policies.pick_first.v3";
8+
option java_outer_classname = "PickFirstProto";
9+
option java_multiple_files = true;
10+
option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/pick_first/v3;pick_firstv3";
11+
option (udpa.annotations.file_status).package_version_status = ACTIVE;
12+
13+
// [#protodoc-title: Pick First Load Balancing Policy]
14+
// [#not-implemented-hide:]
15+
16+
// This configuration allows the built-in PICK_FIRST LB policy to be configured
17+
// via the LB policy extension point.
18+
message PickFirst {
19+
// If set to true, instructs the LB policy to shuffle the list of addresses
20+
// received from the name resolver before attempting to connect to them.
21+
bool shuffle_address_list = 1;
22+
}

0 commit comments

Comments
 (0)