xds: Import latest Envoy protos (#10167)

This commit is contained in:
Terry Wilson 2023-05-11 09:44:43 -07:00 committed by GitHub
parent c16972c54a
commit 793fde840a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 43 additions and 14 deletions

View File

@ -18,7 +18,7 @@
set -e set -e
BRANCH=main BRANCH=main
# import VERSION from the google internal copybara_version.txt for Envoy # import VERSION from the google internal copybara_version.txt for Envoy
VERSION=4a0b099ff8621ebf362516f730de522efbafcece VERSION=0478eba2a495027bf6ac8e787c42e2f5b9eb553b
GIT_REPO="https://github.com/envoyproxy/envoy.git" GIT_REPO="https://github.com/envoyproxy/envoy.git"
GIT_BASE_DIR=envoy GIT_BASE_DIR=envoy
SOURCE_PROTO_BASE_DIR=envoy/api SOURCE_PROTO_BASE_DIR=envoy/api
@ -134,6 +134,7 @@ envoy/extensions/filters/network/http_connection_manager/v3/http_connection_mana
envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.proto envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.proto
envoy/extensions/load_balancing_policies/common/v3/common.proto envoy/extensions/load_balancing_policies/common/v3/common.proto
envoy/extensions/load_balancing_policies/least_request/v3/least_request.proto envoy/extensions/load_balancing_policies/least_request/v3/least_request.proto
envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.proto
envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto
envoy/extensions/load_balancing_policies/round_robin/v3/round_robin.proto envoy/extensions/load_balancing_policies/round_robin/v3/round_robin.proto
envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.proto envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.proto

View File

@ -281,15 +281,3 @@ message ExtensionConfigSource {
// if they do not match any type URL in the set. // if they do not match any type URL in the set.
repeated string type_urls = 4 [(validate.rules).repeated = {min_items: 1}]; repeated string type_urls = 4 [(validate.rules).repeated = {min_items: 1}];
} }
// A placeholder proto for the registration for the REST subscription implementation.
message RestSubscription {
}
// A placeholder proto for the registration for the filesystem subscription implementation.
message FilesystemSubscription {
}
// A placeholder proto for the registration for the filesystem collection subscription implementation.
message FilesystemCollectionSubscription {
}

View File

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

View File

@ -320,6 +320,11 @@ message Principal {
// A CIDR block that describes the downstream IP. // A CIDR block that describes the downstream IP.
// This address will honor proxy protocol, but will not honor XFF. // This address will honor proxy protocol, but will not honor XFF.
//
// This field is deprecated; either use :ref:`direct_remote_ip
// <envoy_v3_api_field_config.rbac.v3.Principal.direct_remote_ip>` for the same
// behavior, or use
// :ref:`remote_ip <envoy_v3_api_field_config.rbac.v3.Principal.remote_ip>`.
core.v3.CidrRange source_ip = 5 core.v3.CidrRange source_ip = 5
[deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"]; [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"];

View File

@ -0,0 +1,22 @@
syntax = "proto3";
package envoy.extensions.load_balancing_policies.pick_first.v3;
import "udpa/annotations/status.proto";
option java_package = "io.envoyproxy.envoy.extensions.load_balancing_policies.pick_first.v3";
option java_outer_classname = "PickFirstProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/pick_first/v3;pick_firstv3";
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#protodoc-title: Pick First Load Balancing Policy]
// [#not-implemented-hide:]
// This configuration allows the built-in PICK_FIRST LB policy to be configured
// via the LB policy extension point.
message PickFirst {
// If set to true, instructs the LB policy to shuffle the list of addresses
// received from the name resolver before attempting to connect to them.
bool shuffle_address_list = 1;
}