Merge remote-tracking branch 'origin/master' into add-clang-cl-build

Signed-off-by: William A Rowe Jr <wrowe@vmware.com>

.dockerignore

@@ -1,4 +1,5 @@
 /*
+!/build_envoy
 !/ci
 !/configs/google-vrp
 !/configs/*yaml

api/bazel/repository_locations.bzl

@@ -22,14 +22,15 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         use_category = ["api"],
     ),
     com_github_cncf_udpa = dict(
-        project_name = "Universal Data Plane API",
-        project_desc = "Universal Data Plane API Working Group (UDPA-WG)",
+        project_name = "xDS API",
+        project_desc = "xDS API Working Group (xDS-WG)",
         project_url = "https://github.com/cncf/udpa",
-        version = "0.0.1",
-        sha256 = "83a7dcc316d741031f34c0409021432b74a39c4811845a177133f02f948fe2d8",
+        # During the UDPA -> xDS migration, we aren't working with releases.
+        version = "5459f2c994033b0afed7e4a70ac7e90c90c1ffee",
+        sha256 = "c1f5c2438cf725b5f66aa4210dbc4bb691020c5ed4f64d2bc6638b06a11482f1",
         strip_prefix = "udpa-{version}",
-        urls = ["https://github.com/cncf/udpa/archive/v{version}.tar.gz"],
-        release_date = "2020-06-29",
+        urls = ["https://github.com/cncf/udpa/archive/{version}.tar.gz"],
+        release_date = "2020-11-20",
         use_category = ["api"],
     ),
     com_github_openzipkin_zipkinapi = dict(

api/envoy/config/bootstrap/v3/BUILD

@@ -17,6 +17,6 @@ api_proto_package(
         "//envoy/extensions/transport_sockets/tls/v3:pkg",
         "//envoy/type/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//udpa/core/v1:pkg",
+        "@com_github_cncf_udpa//xds/core/v3:pkg",
     ],
 )

api/envoy/config/bootstrap/v3/bootstrap.proto

@@ -20,7 +20,7 @@ import "google/protobuf/duration.proto";
 import "google/protobuf/struct.proto";
 import "google/protobuf/wrappers.proto";
 
-import "udpa/core/v1/resource_locator.proto";
+import "xds/core/v3/resource_locator.proto";
 
 import "envoy/annotations/deprecation.proto";
 import "udpa/annotations/migrate.proto";
@@ -79,7 +79,7 @@ message Bootstrap {
 
     // Resource locator for listener collection.
     // [#not-implemented-hide:]
-    udpa.core.v1.ResourceLocator lds_resources_locator = 5;
+    xds.core.v3.ResourceLocator lds_resources_locator = 5;
 
     // All post-bootstrap :ref:`Cluster <envoy_api_msg_config.cluster.v3.Cluster>` definitions are
     // provided by a single :ref:`CDS <arch_overview_dynamic_config_cds>`
@@ -88,7 +88,7 @@ message Bootstrap {
 
     // Resource locator for cluster collection.
     // [#not-implemented-hide:]
-    udpa.core.v1.ResourceLocator cds_resources_locator = 6;
+    xds.core.v3.ResourceLocator cds_resources_locator = 6;
 
     // A single :ref:`ADS <config_overview_ads>` source may be optionally
     // specified. This must have :ref:`api_type
@@ -110,7 +110,7 @@ message Bootstrap {
 
   // A list of :ref:`Node <envoy_v3_api_msg_config.core.v3.Node>` field names
   // that will be included in the context parameters of the effective
-  // *UdpaResourceLocator* that is sent in a discovery request when resource
+  // *XdsResourceLocator* that is sent in a discovery request when resource
   // locators are used for LDS/CDS. Any non-string field will have its JSON
   // encoding set as the context parameter value, with the exception of
   // metadata, which will be flattened (see example below). The supported field
@@ -248,9 +248,9 @@ message Bootstrap {
   repeated FatalAction fatal_actions = 28;
 
   // Configuration sources that will participate in
-  // *udpa.core.v1.ResourceLocator* authority resolution. The algorithm is as
+  // *xds.core.v3.ResourceLocator* authority resolution. The algorithm is as
   // follows:
-  // 1. The authority field is taken from the *udpa.core.v1.ResourceLocator*, call
+  // 1. The authority field is taken from the *xds.core.v3.ResourceLocator*, call
   //    this *resource_authority*.
   // 2. *resource_authority* is compared against the authorities in any peer
   //    *ConfigSource*. The peer *ConfigSource* is the configuration source
@@ -266,7 +266,7 @@ message Bootstrap {
   // [#not-implemented-hide:]
   repeated core.v3.ConfigSource config_sources = 22;
 
-  // Default configuration source for *udpa.core.v1.ResourceLocator* if all
+  // Default configuration source for *xds.core.v3.ResourceLocator* if all
   // other resolution fails.
   // [#not-implemented-hide:]
   core.v3.ConfigSource default_config_source = 23;
@@ -515,7 +515,7 @@ message RuntimeLayer {
 
     // Resource locator for RTDS layer. This is mutually exclusive to *name*.
     // [#not-implemented-hide:]
-    udpa.core.v1.ResourceLocator rtds_resource_locator = 3
+    xds.core.v3.ResourceLocator rtds_resource_locator = 3
         [(udpa.annotations.field_migrate).oneof_promotion = "name_specifier"];
 
     // RTDS configuration source.

api/envoy/config/cluster/v3/BUILD

@@ -13,6 +13,6 @@ api_proto_package(
         "//envoy/config/endpoint/v3:pkg",
         "//envoy/type/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//udpa/core/v1:pkg",
+        "@com_github_cncf_udpa//xds/core/v3:pkg",
     ],
 )

api/envoy/config/cluster/v3/cluster.proto

@@ -19,8 +19,8 @@ import "google/protobuf/duration.proto";
 import "google/protobuf/struct.proto";
 import "google/protobuf/wrappers.proto";
 
-import "udpa/core/v1/collection_entry.proto";
-import "udpa/core/v1/resource_locator.proto";
+import "xds/core/v3/collection_entry.proto";
+import "xds/core/v3/resource_locator.proto";
 
 import "envoy/annotations/deprecation.proto";
 import "udpa/annotations/migrate.proto";
@@ -39,7 +39,7 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
 // Cluster list collections. Entries are *Cluster* resources or references.
 // [#not-implemented-hide:]
 message ClusterCollection {
-  udpa.core.v1.CollectionEntry entries = 1;
+  xds.core.v3.CollectionEntry entries = 1;
 }
 
 // Configuration for a single upstream cluster.
@@ -192,7 +192,7 @@ message Cluster {
 
     // Resource locator for EDS. This is mutually exclusive to *service_name*.
     // [#not-implemented-hide:]
-    udpa.core.v1.ResourceLocator eds_resource_locator = 3
+    xds.core.v3.ResourceLocator eds_resource_locator = 3
         [(udpa.annotations.field_migrate).oneof_promotion = "name_specifier"];
   }
 

api/envoy/config/core/v3/BUILD

@@ -11,6 +11,6 @@ api_proto_package(
         "//envoy/type/matcher/v3:pkg",
         "//envoy/type/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//udpa/core/v1:pkg",
+        "@com_github_cncf_udpa//xds/core/v3:pkg",
     ],
 )

api/envoy/config/core/v3/config_source.proto

@@ -7,7 +7,7 @@ import "envoy/config/core/v3/grpc_service.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/wrappers.proto";
 
-import "udpa/core/v1/authority.proto";
+import "xds/core/v3/authority.proto";
 
 import "envoy/annotations/deprecation.proto";
 import "udpa/annotations/status.proto";
@@ -153,11 +153,11 @@ message ConfigSource {
   option (udpa.annotations.versioning).previous_message_type = "envoy.api.v2.core.ConfigSource";
 
   // Authorities that this config source may be used for. An authority specified
-  // in a *udpa.core.v1.ResourceLocator* is resolved to a *ConfigSource* prior
+  // in a *xds.core.v3.ResourceLocator* is resolved to a *ConfigSource* prior
   // to configuration fetch. This field provides the association between
   // authority name and configuration source.
   // [#not-implemented-hide:]
-  repeated udpa.core.v1.Authority authorities = 7;
+  repeated xds.core.v3.Authority authorities = 7;
 
   oneof config_source_specifier {
     option (validate.required) = true;

api/envoy/config/listener/v3/BUILD

@@ -13,6 +13,6 @@ api_proto_package(
         "//envoy/config/listener/v2:pkg",
         "//envoy/type/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//udpa/core/v1:pkg",
+        "@com_github_cncf_udpa//xds/core/v3:pkg",
     ],
 )

api/envoy/config/listener/v3/listener.proto

@@ -15,7 +15,7 @@ import "google/api/annotations.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/wrappers.proto";
 
-import "udpa/core/v1/collection_entry.proto";
+import "xds/core/v3/collection_entry.proto";
 
 import "udpa/annotations/security.proto";
 import "udpa/annotations/status.proto";
@@ -33,7 +33,7 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
 // Listener list collections. Entries are *Listener* resources or references.
 // [#not-implemented-hide:]
 message ListenerCollection {
-  repeated udpa.core.v1.CollectionEntry entries = 1;
+  repeated xds.core.v3.CollectionEntry entries = 1;
 }
 
 // [#next-free-field: 26]

api/envoy/extensions/common/tap/v3/BUILD

@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/config/common/tap/v2alpha:pkg",
         "//envoy/config/tap/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//udpa/core/v1:pkg",
+        "@com_github_cncf_udpa//xds/core/v3:pkg",
     ],
 )

api/envoy/extensions/common/tap/v3/common.proto

@@ -4,7 +4,7 @@ package envoy.extensions.common.tap.v3;
 
 import "envoy/config/tap/v3/common.proto";
 
-import "udpa/core/v1/resource_locator.proto";
+import "xds/core/v3/resource_locator.proto";
 
 import "udpa/annotations/migrate.proto";
 import "udpa/annotations/status.proto";