api: update to envoyproxy/envoy@ca7aed4

api/src/main/proto/envoy/admin/v2alpha/certs.proto

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
-option java_multiple_files = true;
 
 import "google/protobuf/timestamp.proto";
 

api/src/main/proto/envoy/admin/v2alpha/clusters.proto

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
-option java_multiple_files = true;
 
 import "envoy/admin/v2alpha/metrics.proto";
 import "envoy/api/v2/core/address.proto";

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

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
-option java_multiple_files = true;
 
 import "envoy/api/v2/cds.proto";
 import "envoy/api/v2/lds.proto";

api/src/main/proto/envoy/admin/v2alpha/memory.proto

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
-option java_multiple_files = true;
 
 // [#protodoc-title: Memory]
 

api/src/main/proto/envoy/admin/v2alpha/metrics.proto

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
-option java_multiple_files = true;
 
 // [#protodoc-title: Metrics]
 

api/src/main/proto/envoy/admin/v2alpha/mutex_stats.proto

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
-option java_multiple_files = true;
 
 // [#protodoc-title: MutexStats]
 

api/src/main/proto/envoy/admin/v2alpha/server_info.proto

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
-option java_multiple_files = true;
 
 import "google/protobuf/duration.proto";
 

api/src/main/proto/envoy/api/v2/auth/cert.proto

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.api.v2.auth;
 option java_package = "io.envoyproxy.envoy.api.v2.auth";
-option java_multiple_files = true;
 option go_package = "auth";
 
 import "envoy/api/v2/core/base.proto";
@@ -38,12 +37,14 @@ message TlsParameters {
   // Minimum TLS protocol version. By default, it's ``TLSv1_0``.
   TlsProtocol tls_minimum_protocol_version = 1 [(validate.rules).enum.defined_only = true];
 
-  // Maximum TLS protocol version. By default, it's ``TLSv1_2``.
+  // Maximum TLS protocol version. By default, it's ``TLSv1_3`` for servers in non-FIPS builds, and
+  // ``TLSv1_2`` for clients and for servers using :ref:`BoringSSL FIPS <arch_overview_ssl_fips>`.
   TlsProtocol tls_maximum_protocol_version = 2 [(validate.rules).enum.defined_only = true];
 
   // If specified, the TLS listener will only support the specified `cipher list
-  // <https://commondatastorage.googleapis.com/chromium-boringssl-docs/ssl.h.html#Cipher-suite-configuration>`_.
-  // If not specified, the default list will be used.
+  // <https://commondatastorage.googleapis.com/chromium-boringssl-docs/ssl.h.html#Cipher-suite-configuration>`_
+  // when negotiating TLS 1.0-1.2 (this setting has no effect when negotiating TLS 1.3). If not
+  // specified, the default list will be used.
   //
   // In non-FIPS builds, the default cipher list is:
   //

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

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.api.v2;
 option java_package = "io.envoyproxy.envoy.api.v2";
-option java_multiple_files = true;
 
 option java_generic_services = true;
 
@@ -233,9 +232,8 @@ message Cluster {
   // for upstream connections. The key should match the extension filter name, such as
   // "envoy.filters.network.thrift_proxy". See the extension's documentation for details on
   // specific options.
-  map<string, google.protobuf.Struct> extension_protocol_options = 35;
+  map<string, google.protobuf.Struct> extension_protocol_options = 35 [deprecated = true];
 
-  // [#not-implemented-hide:]
   // The extension_protocol_options field is used to provide extension-specific protocol options
   // for upstream connections. The key should match the extension filter name, such as
   // "envoy.filters.network.thrift_proxy". See the extension's documentation for details on
@@ -417,6 +415,20 @@ message Cluster {
     // Deprecated settings from v1 config.
     // [#not-implemented-hide:] Hide from docs.
     DeprecatedV1 deprecated_v1 = 2 [deprecated = true];
+
+    // The hash function used to hash hosts onto the ketama ring.
+    enum HashFunction {
+      // Use `xxHash <https://github.com/Cyan4973/xxHash>`_, this is the default hash function.
+      XX_HASH = 0;
+      // Use `MurmurHash2 <https://sites.google.com/site/murmurhash/>`_, this is compatible with
+      // std:hash<string> in GNU libstdc++ 3.4.20 or above. This is typically the case when compiled
+      // on Linux and not macOS.
+      MURMUR_HASH_2 = 1;
+    }
+
+    // The hash function used to hash hosts onto the ketama ring. The value defaults to
+    // :ref:`XX_HASH<envoy_api_enum_value_Cluster.RingHashLbConfig.HashFunction.XX_HASH>`.
+    HashFunction hash_function = 3 [(validate.rules).enum.defined_only = true];
   }
 
   // Specific configuration for the

api/src/main/proto/envoy/api/v2/cluster/circuit_breaker.proto

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.api.v2.cluster;
 option java_package = "io.envoyproxy.envoy.api.v2.cluster";
-option java_multiple_files = true;
 option go_package = "cluster";
 option csharp_namespace = "Envoy.Api.V2.ClusterNS";
 

api/src/main/proto/envoy/api/v2/cluster/outlier_detection.proto

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.api.v2.cluster;
 option java_package = "io.envoyproxy.envoy.api.v2.cluster";
-option java_multiple_files = true;
 option csharp_namespace = "Envoy.Api.V2.ClusterNS";
 
 import "google/protobuf/duration.proto";

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

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.api.v2.core;
 option java_package = "io.envoyproxy.envoy.api.v2.core";
-option java_multiple_files = true;
 
 import "envoy/api/v2/core/base.proto";
 

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

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.api.v2.core;
 option java_package = "io.envoyproxy.envoy.api.v2.core";
-option java_multiple_files = true;
 option go_package = "core";
 
 import "google/protobuf/any.proto";
@@ -190,9 +189,8 @@ message TransportSocket {
   // Implementation specific configuration which depends on the implementation being instantiated.
   // See the supported transport socket implementations for further documentation.
   oneof config_type {
-    google.protobuf.Struct config = 2;
+    google.protobuf.Struct config = 2 [deprecated = true];
 
-    // [#not-implemented-hide:]
     google.protobuf.Any typed_config = 3;
   }
 }

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

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.api.v2.core;
 option java_package = "io.envoyproxy.envoy.api.v2.core";
-option java_multiple_files = true;
 
 import "envoy/api/v2/core/grpc_service.proto";
 
@@ -21,8 +20,9 @@ option (gogoproto.equal_all) = true;
 message ApiConfigSource {
   // APIs may be fetched via either REST or gRPC.
   enum ApiType {
-    // REST-JSON legacy corresponds to the v1 API.
-    REST_LEGACY = 0 [deprecated = true];
+    // Ideally this would be 'reserved 0' but one can't reserve the default
+    // value. Instead we throw an exception if this is ever used.
+    UNSUPPORTED_REST_LEGACY = 0 [deprecated = true];
     // REST-JSON v2 API. The `canonical JSON encoding
     // <https://developers.google.com/protocol-buffers/docs/proto3#json>`_ for
     // the v2 protos is used.
@@ -31,7 +31,7 @@ message ApiConfigSource {
     GRPC = 2;
   }
   ApiType api_type = 1 [(validate.rules).enum.defined_only = true];
-  // Cluster names should be used only with REST_LEGACY/REST. If > 1
+  // Cluster names should be used only with REST. If > 1
   // cluster is defined, clusters will be cycled through if any kind of failure
   // occurs.
   //

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

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.api.v2.core;
 option java_package = "io.envoyproxy.envoy.api.v2.core";
-option java_multiple_files = true;
 
 import "envoy/api/v2/core/base.proto";
 
@@ -82,9 +81,8 @@ message GrpcService {
       message MetadataCredentialsFromPlugin {
         string name = 1;
         oneof config_type {
-          google.protobuf.Struct config = 2;
+          google.protobuf.Struct config = 2 [deprecated = true];
 
-          // [#not-implemented-hide:]
           google.protobuf.Any typed_config = 3;
         }
       }

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

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.api.v2.core;
 option java_package = "io.envoyproxy.envoy.api.v2.core";
-option java_multiple_files = true;
 
 import "envoy/api/v2/core/base.proto";
 
@@ -163,9 +162,8 @@ message HealthCheck {
     // A custom health checker specific configuration which depends on the custom health checker
     // being instantiated. See :api:`envoy/config/health_checker` for reference.
     oneof config_type {
-      google.protobuf.Struct config = 2;
+      google.protobuf.Struct config = 2 [deprecated = true];
 
-      // [#not-implemented-hide:]
       google.protobuf.Any typed_config = 3;
     }
   }

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

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.api.v2.core;
 option java_package = "io.envoyproxy.envoy.api.v2.core";
-option java_multiple_files = true;
 
 import "google/protobuf/duration.proto";
 import "gogoproto/gogo.proto";

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

@@ -4,7 +4,6 @@ syntax = "proto3";
 
 package envoy.api.v2.core;
 option java_package = "io.envoyproxy.envoy.api.v2.core";
-option java_multiple_files = true;
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/wrappers.proto";

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

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.api.v2;
 option java_package = "io.envoyproxy.envoy.api.v2";
-option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/api/v2/core/base.proto";

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

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.api.v2;
 option java_package = "io.envoyproxy.envoy.api.v2";
-option java_multiple_files = true;
 
 option java_generic_services = true;
 
@@ -53,6 +52,9 @@ message ClusterLoadAssignment {
   // List of endpoints to load balance to.
   repeated endpoint.LocalityLbEndpoints endpoints = 2 [(gogoproto.nullable) = false];
 
+  // Map of named endpoints that can be referenced in LocalityLbEndpoints.
+  map<string, endpoint.Endpoint> named_endpoints = 5;
+
   // Load balancing policy settings.
   message Policy {
     reserved 1;

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

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.api.v2.endpoint;
 option java_package = "io.envoyproxy.envoy.api.v2.endpoint";
-option java_multiple_files = true;
 option go_package = "endpoint";
 
 import "envoy/api/v2/core/address.proto";
@@ -54,8 +53,11 @@ message Endpoint {
 
 // An Endpoint that Envoy can route traffic to.
 message LbEndpoint {
-  // Upstream host identifier
-  Endpoint endpoint = 1;
+  // Upstream host identifier or a named reference.
+  oneof host_identifier {
+    Endpoint endpoint = 1;
+    string endpoint_name = 5;
+  }
 
   // Optional health status when known and supplied by EDS server.
   core.HealthStatus health_status = 2;

api/src/main/proto/envoy/api/v2/endpoint/load_report.proto

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.api.v2.endpoint;
 option java_package = "io.envoyproxy.envoy.api.v2.endpoint";
-option java_multiple_files = true;
 
 import "envoy/api/v2/core/address.proto";
 import "envoy/api/v2/core/base.proto";

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

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.api.v2;
 option java_package = "io.envoyproxy.envoy.api.v2";
-option java_multiple_files = true;
 
 option java_generic_services = true;
 

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

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.api.v2.listener;
 option java_package = "io.envoyproxy.envoy.api.v2.listener";
-option java_multiple_files = true;
 option go_package = "listener";
 option csharp_namespace = "Envoy.Api.V2.ListenerNS";
 
@@ -39,9 +38,8 @@ message Filter {
   // Filter specific configuration which depends on the filter being
   // instantiated. See the supported filters for further documentation.
   oneof config_type {
-    google.protobuf.Struct config = 2;
+    google.protobuf.Struct config = 2 [deprecated = true];
 
-    // [#not-implemented-hide:]
     google.protobuf.Any typed_config = 4;
   }
 
@@ -209,9 +207,8 @@ message ListenerFilter {
   // Filter specific configuration which depends on the filter being instantiated.
   // See the supported filters for further documentation.
   oneof config_type {
-    google.protobuf.Struct config = 2;
+    google.protobuf.Struct config = 2 [deprecated = true];
 
-    // [#not-implemented-hide:]
     google.protobuf.Any typed_config = 3;
   }
 }

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

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.api.v2.ratelimit;
 option java_package = "io.envoyproxy.envoy.api.v2.ratelimit";
-option java_multiple_files = true;
 option go_package = "ratelimit";
 
 import "validate/validate.proto";

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

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.api.v2;
 option java_package = "io.envoyproxy.envoy.api.v2";
-option java_multiple_files = true;
 
 option java_generic_services = true;