api: update to envoyproxy/envoy@ca7aed4 (#88)

Signed-off-by: Penn (Dapeng) Zhang <zdapeng@google.com>

Author: dapengzhang0

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";