Merge branch 'master' into opt-ref

Signed-off-by: Jose Nino <jnino@lyft.com>

.clang-format

@@ -12,4 +12,5 @@ Language: Proto
 ColumnLimit: 100
 SpacesInContainerLiterals: false
 AllowShortFunctionsOnASingleLine: false
+ReflowComments: false
 ...

BUILD

@@ -1,3 +1,6 @@
 licenses(["notice"])  # Apache 2
 
-exports_files(["VERSION"])
+exports_files([
+    "VERSION",
+    ".clang-format",
+])

VERSION

@@ -1 +1 @@
-1.13.0-dev
+1.14.0-dev

api/BUILD

@@ -5,11 +5,10 @@ load("@rules_proto//proto:defs.bzl", "proto_library")
 licenses(["notice"])  # Apache 2
 
 proto_library(
-    name = "protos",
+    name = "v2_protos",
     visibility = ["//visibility:public"],
     deps = [
         "//envoy/admin/v2alpha:pkg",
-        "//envoy/admin/v3:pkg",
         "//envoy/api/v2:pkg",
         "//envoy/api/v2/auth:pkg",
         "//envoy/api/v2/cluster:pkg",
@@ -19,17 +18,12 @@ proto_library(
         "//envoy/api/v2/ratelimit:pkg",
         "//envoy/api/v2/route:pkg",
         "//envoy/config/accesslog/v2:pkg",
-        "//envoy/config/accesslog/v3:pkg",
         "//envoy/config/bootstrap/v2:pkg",
-        "//envoy/config/bootstrap/v3:pkg",
         "//envoy/config/cluster/aggregate/v2alpha:pkg",
         "//envoy/config/cluster/dynamic_forward_proxy/v2alpha:pkg",
         "//envoy/config/cluster/redis:pkg",
-        "//envoy/config/cluster/v3:pkg",
         "//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg",
         "//envoy/config/common/tap/v2alpha:pkg",
-        "//envoy/config/core/v3:pkg",
-        "//envoy/config/endpoint/v3:pkg",
         "//envoy/config/filter/accesslog/v2:pkg",
         "//envoy/config/filter/dubbo/router/v2alpha1:pkg",
         "//envoy/config/filter/fault/v2:pkg",
@@ -84,37 +78,72 @@ proto_library(
         "//envoy/config/filter/thrift/router/v2alpha1:pkg",
         "//envoy/config/filter/udp/udp_proxy/v2alpha:pkg",
         "//envoy/config/grpc_credential/v2alpha:pkg",
-        "//envoy/config/grpc_credential/v3:pkg",
         "//envoy/config/health_checker/redis/v2:pkg",
         "//envoy/config/listener/v2:pkg",
-        "//envoy/config/listener/v3:pkg",
         "//envoy/config/metrics/v2:pkg",
-        "//envoy/config/metrics/v3:pkg",
         "//envoy/config/overload/v2alpha:pkg",
-        "//envoy/config/overload/v3:pkg",
         "//envoy/config/ratelimit/v2:pkg",
-        "//envoy/config/ratelimit/v3:pkg",
         "//envoy/config/rbac/v2:pkg",
-        "//envoy/config/rbac/v3:pkg",
         "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg",
         "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg",
         "//envoy/config/retry/omit_canary_hosts/v2:pkg",
+        "//envoy/config/retry/omit_host_metadata/v2:pkg",
         "//envoy/config/retry/previous_hosts/v2:pkg",
         "//envoy/config/retry/previous_priorities:pkg",
-        "//envoy/config/route/v3:pkg",
-        "//envoy/config/tap/v3:pkg",
         "//envoy/config/trace/v2:pkg",
         "//envoy/config/trace/v2alpha:pkg",
-        "//envoy/config/trace/v3:pkg",
         "//envoy/config/transport_socket/alts/v2alpha:pkg",
         "//envoy/config/transport_socket/raw_buffer/v2:pkg",
         "//envoy/config/transport_socket/tap/v2alpha:pkg",
         "//envoy/data/accesslog/v2:pkg",
-        "//envoy/data/accesslog/v3:pkg",
         "//envoy/data/cluster/v2alpha:pkg",
         "//envoy/data/core/v2alpha:pkg",
-        "//envoy/data/core/v3:pkg",
         "//envoy/data/tap/v2alpha:pkg",
+        "//envoy/service/accesslog/v2:pkg",
+        "//envoy/service/auth/v2:pkg",
+        "//envoy/service/discovery/v2:pkg",
+        "//envoy/service/load_stats/v2:pkg",
+        "//envoy/service/metrics/v2:pkg",
+        "//envoy/service/ratelimit/v2:pkg",
+        "//envoy/service/status/v2:pkg",
+        "//envoy/service/tap/v2alpha:pkg",
+        "//envoy/service/trace/v2:pkg",
+        "//envoy/type:pkg",
+        "//envoy/type/matcher:pkg",
+        "//envoy/type/metadata/v2:pkg",
+        "//envoy/type/tracing/v2:pkg",
+    ],
+)
+
+proto_library(
+    name = "v3_protos",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//envoy/admin/v3:pkg",
+        "//envoy/config/accesslog/v3:pkg",
+        "//envoy/config/bootstrap/v3:pkg",
+        "//envoy/config/cluster/v3:pkg",
+        "//envoy/config/core/v3:pkg",
+        "//envoy/config/endpoint/v3:pkg",
+        "//envoy/config/filter/thrift/router/v2alpha1:pkg",
+        "//envoy/config/filter/udp/udp_proxy/v2alpha:pkg",
+        "//envoy/config/grpc_credential/v3:pkg",
+        "//envoy/config/health_checker/redis/v2:pkg",
+        "//envoy/config/listener/v3:pkg",
+        "//envoy/config/metrics/v3:pkg",
+        "//envoy/config/overload/v3:pkg",
+        "//envoy/config/ratelimit/v3:pkg",
+        "//envoy/config/rbac/v3:pkg",
+        "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg",
+        "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg",
+        "//envoy/config/retry/omit_canary_hosts/v2:pkg",
+        "//envoy/config/retry/previous_hosts/v2:pkg",
+        "//envoy/config/route/v3:pkg",
+        "//envoy/config/tap/v3:pkg",
+        "//envoy/config/trace/v3:pkg",
+        "//envoy/data/accesslog/v3:pkg",
+        "//envoy/data/cluster/v3:pkg",
+        "//envoy/data/core/v3:pkg",
         "//envoy/data/tap/v3:pkg",
         "//envoy/extensions/access_loggers/file/v3:pkg",
         "//envoy/extensions/access_loggers/grpc/v3:pkg",
@@ -174,39 +203,40 @@ proto_library(
         "//envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3:pkg",
         "//envoy/extensions/filters/network/thrift_proxy/v3:pkg",
         "//envoy/extensions/filters/network/zookeeper_proxy/v3:pkg",
+        "//envoy/extensions/retry/host/omit_host_metadata/v3:pkg",
         "//envoy/extensions/retry/priority/previous_priorities/v3:pkg",
         "//envoy/extensions/transport_sockets/alts/v3:pkg",
         "//envoy/extensions/transport_sockets/raw_buffer/v3:pkg",
         "//envoy/extensions/transport_sockets/tap/v3:pkg",
         "//envoy/extensions/transport_sockets/tls/v3:pkg",
-        "//envoy/service/accesslog/v2:pkg",
         "//envoy/service/accesslog/v3:pkg",
-        "//envoy/service/auth/v2:pkg",
         "//envoy/service/auth/v3:pkg",
         "//envoy/service/cluster/v3:pkg",
-        "//envoy/service/discovery/v2:pkg",
         "//envoy/service/discovery/v3:pkg",
         "//envoy/service/endpoint/v3:pkg",
         "//envoy/service/health/v3:pkg",
         "//envoy/service/listener/v3:pkg",
-        "//envoy/service/load_stats/v2:pkg",
         "//envoy/service/load_stats/v3:pkg",
-        "//envoy/service/metrics/v2:pkg",
         "//envoy/service/metrics/v3:pkg",
-        "//envoy/service/ratelimit/v2:pkg",
         "//envoy/service/ratelimit/v3:pkg",
         "//envoy/service/route/v3:pkg",
         "//envoy/service/runtime/v3:pkg",
         "//envoy/service/secret/v3:pkg",
-        "//envoy/service/tap/v2alpha:pkg",
+        "//envoy/service/status/v3:pkg",
         "//envoy/service/tap/v3:pkg",
-        "//envoy/service/trace/v2:pkg",
         "//envoy/service/trace/v3:pkg",
-        "//envoy/type:pkg",
-        "//envoy/type/matcher:pkg",
         "//envoy/type/matcher/v3:pkg",
-        "//envoy/type/metadata/v2:pkg",
-        "//envoy/type/tracing/v2:pkg",
+        "//envoy/type/metadata/v3:pkg",
+        "//envoy/type/tracing/v3:pkg",
         "//envoy/type/v3:pkg",
     ],
 )
+
+proto_library(
+    name = "all_protos",
+    visibility = ["//visibility:public"],
+    deps = [
+        ":v2_protos",
+        ":v3_protos",
+    ],
+)

api/docs/BUILD

@@ -93,6 +93,7 @@ proto_library(
         "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg",
         "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg",
         "//envoy/config/retry/omit_canary_hosts/v2:pkg",
+        "//envoy/config/retry/omit_host_metadata/v2:pkg",
         "//envoy/config/retry/previous_hosts/v2:pkg",
         "//envoy/config/retry/previous_priorities:pkg",
         "//envoy/config/trace/v2:pkg",
@@ -110,6 +111,7 @@ proto_library(
         "//envoy/service/load_stats/v2:pkg",
         "//envoy/service/metrics/v2:pkg",
         "//envoy/service/ratelimit/v2:pkg",
+        "//envoy/service/status/v2:pkg",
         "//envoy/service/tap/v2alpha:pkg",
         "//envoy/service/trace/v2:pkg",
         "//envoy/type:pkg",

api/envoy/admin/v2alpha/tap.proto

@@ -10,6 +10,8 @@ option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "TapProto";
 option java_multiple_files = true;
 
+// [#protodoc-title: Tap]
+
 // The /tap admin request body that is used to configure an active tap session.
 message TapRequest {
   // The opaque configuration ID used to match the configuration to a loaded extension.

api/envoy/admin/v3/config_dump.proto

@@ -91,9 +91,9 @@ message ListenersConfigDump {
         "envoy.admin.v2alpha.ListenersConfigDump.DynamicListenerState";
 
     // This is the per-resource version information. This version is currently taken from the
-    // :ref:`version_info <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>`
-    // field at the time that the listener was loaded. In the future, discrete per-listener versions
-    // may be supported by the API.
+    // :ref:`version_info <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>` field at the time
+    // that the listener was loaded. In the future, discrete per-listener versions may be supported
+    // by the API.
     string version_info = 1;
 
     // The listener config.
@@ -132,9 +132,9 @@ message ListenersConfigDump {
     UpdateFailureState error_state = 5;
   }
 
-  // This is the :ref:`version_info
-  // <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>` in the last processed
-  // LDS discovery response. If there are only static bootstrap listeners, this field will be "".
+  // This is the :ref:`version_info <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>` in the
+  // last processed LDS discovery response. If there are only static bootstrap listeners, this field
+  // will be "".
   string version_info = 1;
 
   // The statically loaded listener configs.
@@ -169,9 +169,9 @@ message ClustersConfigDump {
         "envoy.admin.v2alpha.ClustersConfigDump.DynamicCluster";
 
     // This is the per-resource version information. This version is currently taken from the
-    // :ref:`version_info <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>`
-    // field at the time that the cluster was loaded. In the future, discrete per-cluster versions
-    // may be supported by the API.
+    // :ref:`version_info <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>` field at the time
+    // that the cluster was loaded. In the future, discrete per-cluster versions may be supported by
+    // the API.
     string version_info = 1;
 
     // The cluster config.
@@ -181,9 +181,9 @@ message ClustersConfigDump {
     google.protobuf.Timestamp last_updated = 3;
   }
 
-  // This is the :ref:`version_info
-  // <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>` in the last processed
-  // CDS discovery response. If there are only static bootstrap clusters, this field will be "".
+  // This is the :ref:`version_info <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>` in the
+  // last processed CDS discovery response. If there are only static bootstrap clusters, this field
+  // will be "".
   string version_info = 1;
 
   // The statically loaded cluster configs.
@@ -225,8 +225,8 @@ message RoutesConfigDump {
         "envoy.admin.v2alpha.RoutesConfigDump.DynamicRouteConfig";
 
     // This is the per-resource version information. This version is currently taken from the
-    // :ref:`version_info <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>`
-    // field at the time that the route configuration was loaded.
+    // :ref:`version_info <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>` field at the time that
+    // the route configuration was loaded.
     string version_info = 1;
 
     // The route config.
@@ -273,8 +273,8 @@ message ScopedRoutesConfigDump {
     string name = 1;
 
     // This is the per-resource version information. This version is currently taken from the
-    // :ref:`version_info <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>`
-    // field at the time that the scoped routes configuration was loaded.
+    // :ref:`version_info <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>` field at the time that
+    // the scoped routes configuration was loaded.
     string version_info = 2;
 
     // The scoped route configurations.

api/envoy/admin/v3/tap.proto

@@ -12,6 +12,8 @@ option java_package = "io.envoyproxy.envoy.admin.v3";
 option java_outer_classname = "TapProto";
 option java_multiple_files = true;
 
+// [#protodoc-title: Tap]
+
 // The /tap admin request body that is used to configure an active tap session.
 message TapRequest {
   option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v2alpha.TapRequest";

api/envoy/annotations/deprecation.proto

@@ -4,6 +4,7 @@ package envoy.annotations;
 
 import "google/protobuf/descriptor.proto";
 
+// [#protodoc-title: Deprecation]
 // Allows tagging proto fields as fatal by default. One Envoy release after
 // deprecation, deprecated fields will be disallowed by default, a state which
 // is reversible with :ref:`runtime overrides <config_runtime_deprecation>`.

api/envoy/annotations/resource.proto

@@ -4,6 +4,8 @@ package envoy.annotations;
 
 import "google/protobuf/descriptor.proto";
 
+// [#protodoc-title: Resource]
+
 // Magic number in this file derived from top 28bit of SHA256 digest of "envoy.annotation.resource".
 extend google.protobuf.ServiceOptions {
   ResourceAnnotation resource = 265073217;

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

@@ -192,8 +192,8 @@ message CertificateValidationContext {
   // <envoy_api_field_auth.CertificateValidationContext.verify_certificate_spki>`,
   // :ref:`verify_certificate_hash
   // <envoy_api_field_auth.CertificateValidationContext.verify_certificate_hash>`, or
-  // :ref:`verify_subject_alt_name
-  // <envoy_api_field_auth.CertificateValidationContext.verify_subject_alt_name>`) is also
+  // :ref:`match_subject_alt_names
+  // <envoy_api_field_auth.CertificateValidationContext.match_subject_alt_names>`) is also
   // specified.
   //
   // It can optionally contain certificate revocation lists, in which case Envoy will verify

api/envoy/api/v2/cluster.proto

@@ -558,15 +558,12 @@ message Cluster {
   // :ref:`STATIC<envoy_api_enum_value_Cluster.DiscoveryType.STATIC>`,
   // :ref:`STRICT_DNS<envoy_api_enum_value_Cluster.DiscoveryType.STRICT_DNS>`
   // or :ref:`LOGICAL_DNS<envoy_api_enum_value_Cluster.DiscoveryType.LOGICAL_DNS>` clusters.
-  // This field supersedes :ref:`hosts<envoy_api_field_Cluster.hosts>` field.
-  // [#comment:TODO(dio): Deprecate the hosts field and add it to :ref:`deprecated log<deprecated>`
-  // once load_assignment is implemented.]
+  // This field supersedes the *hosts* field in the v2 API.
   //
   // .. attention::
   //
   //   Setting this allows non-EDS cluster types to contain embedded EDS equivalent
   //   :ref:`endpoint assignments<envoy_api_msg_ClusterLoadAssignment>`.
-  //   Setting this overrides :ref:`hosts<envoy_api_field_Cluster.hosts>` values.
   //
   ClusterLoadAssignment load_assignment = 33;
 

api/envoy/api/v2/cluster/filter.proto

@@ -15,8 +15,8 @@ option ruby_package = "Envoy.Api.V2.ClusterNS";
 option (udpa.annotations.file_migrate).move_to_package = "envoy.config.cluster.v3";
 
 // [#protodoc-title: Upstream filters]
-//
 // Upstream filters apply to the connections to the upstream cluster hosts.
+
 message Filter {
   // The name of the filter to instantiate. The name must match a
   // :ref:`supported filter <config_network_filters>`.

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

@@ -134,7 +134,8 @@ message Node {
   // Defines the local service cluster name where Envoy is running. Though
   // optional, it should be set if any of the following features are used:
   // :ref:`statsd <arch_overview_statistics>`, :ref:`health check cluster
-  // verification <envoy_api_field_core.HealthCheck.HttpHealthCheck.service_name>`,
+  // verification
+  // <envoy_api_field_core.HealthCheck.HttpHealthCheck.service_name_matcher>`,
   // :ref:`runtime override directory <envoy_api_msg_config.bootstrap.v2.Runtime>`,
   // :ref:`user agent addition
   // <envoy_api_field_config.filter.network.http_connection_manager.v2.HttpConnectionManager.add_user_agent>`,

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

@@ -116,10 +116,7 @@ message HealthCheck {
     // range are required. Only statuses in the range [100, 600) are allowed.
     repeated type.Int64Range expected_statuses = 9;
 
-    // Use specified application protocol for health checks. This is to replace
-    // :ref:`use_http2
-    // <envoy_api_field_core.HealthCheck.HttpHealthCheck.use_http2>` in light of
-    // HTTP3.
+    // Use specified application protocol for health checks.
     type.CodecClientType codec_client_type = 10 [(validate.rules).enum = {defined_only: true}];
 
     // An optional service name parameter which is used to validate the identity of