Move E/C/R/LDS service definitions to prevent breaking existing management servers

docs/build.sh

@@ -29,20 +29,22 @@ PROTO_RST="
   /envoy/api/v2/address/envoy/api/v2/address.proto.rst
   /envoy/api/v2/base/envoy/api/v2/base.proto.rst
   /envoy/api/v2/auth/cert/envoy/api/v2/auth/cert.proto.rst
+  /envoy/api/v2/eds/envoy/api/v2/eds.proto.rst
   /envoy/api/v2/endpoint/endpoint/envoy/api/v2/endpoint/endpoint.proto.rst
-  /envoy/api/v2/cluster/cluster/envoy/api/v2/cluster/cluster.proto.rst
+  /envoy/api/v2/cds/envoy/api/v2/cds.proto.rst
   /envoy/api/v2/cluster/outlier_detection/envoy/api/v2/cluster/outlier_detection.proto.rst
   /envoy/api/v2/cluster/circuit_breaker/envoy/api/v2/cluster/circuit_breaker.proto.rst
+  /envoy/api/v2/rds/envoy/api/v2/rds.proto.rst
   /envoy/api/v2/route/route/envoy/api/v2/route/route.proto.rst
+  /envoy/api/v2/lds/envoy/api/v2/lds.proto.rst
   /envoy/api/v2/listener/listener/envoy/api/v2/listener/listener.proto.rst
   /envoy/api/v2/config_source/envoy/api/v2/config_source.proto.rst
   /envoy/api/v2/grpc_service/envoy/api/v2/grpc_service.proto.rst
   /envoy/api/v2/health_check/envoy/api/v2/health_check.proto.rst
   /envoy/api/v2/protocol/envoy/api/v2/protocol.proto.rst
   /envoy/api/v2/ratelimit/ratelimit/envoy/api/v2/ratelimit/ratelimit.proto.rst
   /envoy/config/bootstrap/v2/bootstrap/envoy/config/bootstrap/v2/bootstrap.proto.rst
-  /envoy/service/discovery/v2/common/envoy/service/discovery/v2/common.proto.rst
-  /envoy/service/discovery/v2/eds/envoy/service/discovery/v2/eds.proto.rst
+  /envoy/api/v2/discovery/envoy/api/v2/discovery.proto.rst
   /envoy/config/ratelimit/v2/rls/envoy/config/ratelimit/v2/rls.proto.rst
   /envoy/config/metrics/v2/metrics_service/envoy/config/metrics/v2/metrics_service.proto.rst
   /envoy/config/metrics/v2/stats/envoy/config/metrics/v2/stats.proto.rst

docs/root/api-v2/api.rst

@@ -10,22 +10,24 @@ v2 API reference
   config/bootstrap/v2/bootstrap.proto
   api/v2/config_source.proto
   api/v2/grpc_service.proto
+  api/v2/lds.proto
   api/v2/listener/listener.proto
-  api/v2/cluster/cluster.proto
+  api/v2/cds.proto
   api/v2/cluster/outlier_detection.proto
   api/v2/cluster/circuit_breaker.proto
   api/v2/endpoint/endpoint.proto
-  service/discovery/v2/eds.proto
+  api/v2/eds.proto
   api/v2/health_check.proto
   api/v2/route/route.proto
+  api/v2/rds.proto
   api/v2/auth/cert.proto
   config/metrics/v2/stats.proto
   config/metrics/v2/metrics_service.proto
   config/trace/v2/trace.proto
   api/v2/base.proto
   api/v2/address.proto
   api/v2/protocol.proto
-  service/discovery/v2/common.proto
+  api/v2/discovery.proto
   api/v2/ratelimit/ratelimit.proto
   config/ratelimit/v2/rls.proto
   api/v2/filter/filter

docs/root/configuration/http_conn_man/headers.rst

@@ -283,7 +283,7 @@ Custom request/response headers
 
 Custom request/response headers can be added to a request/response that matches a specific route at
 the route, virtual host, and global route configuration level. See the relevant :ref:`v1
-<config_http_conn_man_route_table>` and :ref:`v2 <envoy_api_msg_route.RouteConfiguration>` API
+<config_http_conn_man_route_table>` and :ref:`v2 <envoy_api_msg_RouteConfiguration>` API
 documentation.
 
 Headers are appended to requests/responses in the following order: route level headers,

docs/root/configuration/listeners/listeners.rst

@@ -7,7 +7,7 @@ The top level Envoy configuration contains a list of :ref:`listeners <arch_overv
 Each individual listener configuration has the following format:
 
 * :ref:`v1 API reference <config_listeners_v1>`
-* :ref:`v2 API reference <envoy_api_msg_listener.Listener>`
+* :ref:`v2 API reference <envoy_api_msg_Listener>`
 
 .. toctree::
   :hidden:

docs/root/configuration/overview/v2_overview.rst

@@ -47,8 +47,8 @@ debug experience when configuration parsing fails.
 The :ref:`Bootstrap <envoy_api_msg_config.bootstrap.v2.Bootstrap>` message is the root of the
 configuration. A key concept in the :ref:`Bootstrap <envoy_api_msg_config.bootstrap.v2.Bootstrap>`
 message is the distinction between static and dynamic resouces. Resources such
-as a :ref:`Listener <envoy_api_msg_listener.Listener>` or :ref:`Cluster
-<envoy_api_msg_cluster.Cluster>` may be supplied either statically in
+as a :ref:`Listener <envoy_api_msg_Listener>` or :ref:`Cluster
+<envoy_api_msg_Cluster>` may be supplied either statically in
 :ref:`static_resources <envoy_api_field_config.bootstrap.v2.Bootstrap.static_resources>` or have
 an xDS service such as :ref:`LDS
 <config_listeners_lds>` or :ref:`CDS <config_cluster_manager_cds>` configured in
@@ -105,7 +105,7 @@ Mostly static with dynamic EDS
 
 A bootstrap config that continues from the above example with :ref:`dynamic endpoint
 discovery <arch_overview_dynamic_config_sds>` via an
-:ref:`EDS<envoy_api_file_envoy/service/discovery/v2/eds.proto>` gRPC management server listening
+:ref:`EDS<envoy_api_file_envoy/api/v2/eds.proto>` gRPC management server listening
 on 127.0.0.3:5678 is provided below:
 
 .. code-block:: yaml
@@ -158,7 +158,7 @@ an otherwise completely dynamic configurations, some static resources need to
 be defined to point Envoy at its xDS management server(s).
 
 In the above example, the EDS management server could then return a proto encoding of a
-:ref:`DiscoveryResponse <envoy_api_msg_service.discovery.v2.DiscoveryResponse>`:
+:ref:`DiscoveryResponse <envoy_api_msg_DiscoveryResponse>`:
 
 .. code-block:: yaml
 
@@ -293,8 +293,8 @@ Management server
 
 A v2 xDS management server will implement the below endpoints as required for
 gRPC and/or REST serving. In both streaming gRPC and
-REST-JSON cases, a :ref:`DiscoveryRequest <envoy_api_msg_service.discovery.v2.DiscoveryRequest>` is sent and a
-:ref:`DiscoveryResponse <envoy_api_msg_service.discovery.v2.DiscoveryResponse>` received following the
+REST-JSON cases, a :ref:`DiscoveryRequest <envoy_api_msg_DiscoveryRequest>` is sent and a
+:ref:`DiscoveryResponse <envoy_api_msg_DiscoveryResponse>` received following the
 `xDS protocol <https://github.com/envoyproxy/data-plane-api/blob/master/XDS_PROTOCOL.md>`_.
 
 .. _v2_grpc_streaming_endpoints:
@@ -333,8 +333,8 @@ for the service definition. This is used by Envoy as a client when
         cluster_names: [some_xds_cluster]
 
 is set in the :ref:`eds_cluster_config
-<envoy_api_field_cluster.Cluster.eds_cluster_config>` field of the :ref:`Cluster
-<envoy_api_msg_cluster.Cluster>` config.
+<envoy_api_field_Cluster.eds_cluster_config>` field of the :ref:`Cluster
+<envoy_api_msg_Cluster>` config.
 
 .. http:post:: /envoy.api.v2.ListenerDiscoveryService/StreamListeners
 
@@ -405,8 +405,8 @@ for the service definition. This is used by Envoy as a client when
         cluster_names: [some_xds_cluster]
 
 is set in the :ref:`eds_cluster_config
-<envoy_api_field_cluster.Cluster.eds_cluster_config>` field of the :ref:`Cluster
-<envoy_api_msg_cluster.Cluster>` config.
+<envoy_api_field_Cluster.eds_cluster_config>` field of the :ref:`Cluster
+<envoy_api_msg_Cluster>` config.
 
 .. http:post:: /v2/discovery:listeners
 

docs/root/intro/arch_overview/dynamic_configuration.rst

@@ -34,7 +34,7 @@ SDS/EDS only
 
 The :ref:`service discovery service (SDS) API <config_cluster_manager_sds>` provides a more advanced
 mechanism by which Envoy can discover members of an upstream cluster. SDS has been renamed to :ref:`Endpoint
-Discovery Service (EDS)<envoy_api_file_envoy/service/discovery/v2/eds.proto>` in the
+Discovery Service (EDS)<envoy_api_file_envoy/api/v2/eds.proto>` in the
 :ref:`v2 API <config_overview_v2>`. Layered on top of a static
 configuration, SDS allows an Envoy deployment to circumvent the limitations of DNS (maximum records
 in a response, etc.) as well as consume more information used in load balancing and routing (e.g.,

docs/root/intro/arch_overview/load_balancing.rst

@@ -240,7 +240,7 @@ not be used with subsets because the upstream hosts are not known in advance. Su
 with zone aware routing, but be aware that the use of subsets may easily violate the minimum hosts
 condition described above.
 
-If subsets are :ref:`configured <envoy_api_field_cluster.Cluster.lb_subset_config>` and a route
+If subsets are :ref:`configured <envoy_api_field_Cluster.lb_subset_config>` and a route
 specifies no metadata or no subset matching the metadata exists, the subset load balancer initiates
 its fallback policy. The default policy is ``NO_ENDPOINT``, in which case the request fails as if
 the cluster had no hosts. Conversely, the ``ANY_ENDPOINT`` fallback policy load balances across all

docs/root/intro/version_history.rst

@@ -20,11 +20,11 @@ Version history
 * http: end-to-end HTTP flow control is now complete across both connections, streams, and filters.
 * load balancer: added :ref:`subset load balancer <arch_overview_load_balancer_subsets>`.
 * load balancer: added ring size and hash :ref:`configuration options
-  <envoy_api_msg_cluster.Cluster.RingHashLbConfig>`. This used to be configurable via runtime. The runtime
+  <envoy_api_msg_Cluster.RingHashLbConfig>`. This used to be configurable via runtime. The runtime
   configuration was deleted without deprecation as we are fairly certain no one is using it.
 * log: added the ability to optionally log to a file instead of stderr via the
   :option:`--log-path` option.
-* listeners: added :ref:`drain_type <envoy_api_field_listener.Listener.drain_type>` option.
+* listeners: added :ref:`drain_type <envoy_api_field_Listener.drain_type>` option.
 * lua: added experimental :ref:`Lua filter <config_http_filters_lua>`.
 * mongo filter: added :ref:`fault injection <config_network_filters_mongo_proxy_fault_injection>`.
 * mongo filter: added :ref:`"drain close" <arch_overview_draining>` support.

envoy/BUILD

@@ -6,7 +6,7 @@ proto_library(
     name = "envoy",
     deps = [
         "//envoy/api/v2",
-        "//envoy/api/v2/cluster",
+        "//envoy/api/v2:cds",
         "//envoy/api/v2/cluster:circuit_breaker",
         "//envoy/api/v2/cluster:outlier_detection",
         "//envoy/api/v2/filter/accesslog",
@@ -20,7 +20,7 @@ proto_library(
         "//envoy/config/metrics/v2:stats",
         "//envoy/config/ratelimit/v2:rls",
         "//envoy/config/trace/v2:trace",
-        "//envoy/service/discovery",
+        "//envoy/service/discovery/v2:ads",
         "//envoy/service/load_stats",
         "//envoy/service/metrics",
     ],

envoy/api/v2/BUILD

@@ -76,10 +76,129 @@ api_go_proto_library(
     proto = ":protocol",
 )
 
+api_proto_library(
+    name = "discovery",
+    srcs = ["discovery.proto"],
+    deps = ["//envoy/api/v2:base"],
+)
+
+api_go_proto_library(
+    name = "discovery",
+    proto = ":discovery",
+    deps = ["//envoy/api/v2:base_go_proto"],
+)
+
+api_proto_library(
+    name = "eds",
+    srcs = ["eds.proto"],
+    has_services = 1,
+    deps = [
+        ":address",
+        ":base",
+        ":discovery",
+        ":health_check",
+        "//envoy/api/v2/endpoint",
+    ],
+)
+
+api_go_grpc_library(
+    name = "eds",
+    proto = ":eds",
+    deps = [
+        ":address_go_proto",
+        ":base_go_proto",
+        ":discovery_go_proto",
+        ":health_check_go_proto",
+        "//envoy/api/v2/endpoint:endpoint_go_proto",
+    ],
+)
+
+api_proto_library(
+    name = "cds",
+    srcs = ["cds.proto"],
+    has_services = 1,
+    deps = [
+        ":address",
+        ":base",
+        ":config_source",
+        ":discovery",
+        ":health_check",
+        ":protocol",
+        "//envoy/api/v2/auth:cert",
+        "//envoy/api/v2/cluster:circuit_breaker",
+        "//envoy/api/v2/cluster:outlier_detection",
+    ],
+)
+
+api_go_grpc_library(
+    name = "cds",
+    proto = ":cds",
+    deps = [
+        ":base_go_proto",
+        ":config_source_go_proto",
+        ":discovery_go_proto",
+        ":health_check_go_proto",
+        ":protocol_go_proto",
+        "//envoy/api/v2:address_go_proto",
+        "//envoy/api/v2/auth:cert_go_proto",
+        "//envoy/api/v2/cluster:circuit_breaker_go_proto",
+        "//envoy/api/v2/cluster:outlier_detection_go_proto",
+    ],
+)
+
+api_proto_library(
+    name = "lds",
+    srcs = ["lds.proto"],
+    has_services = 1,
+    deps = [
+        ":address",
+        ":base",
+        ":discovery",
+        "//envoy/api/v2/listener",
+    ],
+)
+
+api_go_grpc_library(
+    name = "lds",
+    proto = ":lds",
+    deps = [
+        ":address_go_proto",
+        ":base_go_proto",
+        ":discovery_go_proto",
+        "//envoy/api/v2/listener:listener_go_proto",
+    ],
+)
+
+api_proto_library(
+    name = "rds",
+    srcs = ["rds.proto"],
+    has_services = 1,
+    deps = [
+        ":base",
+        ":discovery",
+        "//envoy/api/v2/route",
+    ],
+)
+
+api_go_grpc_library(
+    name = "rds",
+    proto = ":rds",
+    deps = [
+        ":base_go_proto",
+        ":discovery_go_proto",
+        "//envoy/api/v2/route:route_go_proto",
+    ],
+)
+
 proto_library(
     name = "v2",
     visibility = ["//envoy:__pkg__"],
     deps = [
+        ":cds",
+        ":discovery",
+        ":eds",
+        ":lds",
         ":protocol",
+        ":rds",
     ],
 )