From 90a97c7ef3d67e213980db6b0ebeff284a938837 Mon Sep 17 00:00:00 2001 From: Yutong Li Date: Wed, 12 Aug 2020 11:14:09 -0700 Subject: [PATCH] api: add node field to csds request (#12522) Added an node field to csds request to identify the CSDS client to the CSDS server, and removed the [#not-implemented-hide:] for the endpoint_config since it has been implemented in #11577 Risk Level: Low Testing: N/A Docs Changes: N/A Release Notes: N/A Signed-off-by: Yutong Li --- api/envoy/service/status/v3/csds.proto | 4 +++- api/envoy/service/status/v4alpha/csds.proto | 4 +++- generated_api_shadow/envoy/service/status/v3/csds.proto | 4 +++- generated_api_shadow/envoy/service/status/v4alpha/csds.proto | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/api/envoy/service/status/v3/csds.proto b/api/envoy/service/status/v3/csds.proto index beccfb8cb58e..23f1352bf489 100644 --- a/api/envoy/service/status/v3/csds.proto +++ b/api/envoy/service/status/v3/csds.proto @@ -61,6 +61,9 @@ message ClientStatusRequest { // Management server can use these match criteria to identify clients. // The match follows OR semantics. repeated type.matcher.v3.NodeMatcher node_matchers = 1; + + // The node making the csds request. + config.core.v3.Node node = 2; } // Detailed config (per xDS) with status. @@ -80,7 +83,6 @@ message PerXdsConfig { admin.v3.ScopedRoutesConfigDump scoped_route_config = 5; - // [#not-implemented-hide:] admin.v3.EndpointsConfigDump endpoint_config = 6; } } diff --git a/api/envoy/service/status/v4alpha/csds.proto b/api/envoy/service/status/v4alpha/csds.proto index 2286eb94a8a7..37758954cadb 100644 --- a/api/envoy/service/status/v4alpha/csds.proto +++ b/api/envoy/service/status/v4alpha/csds.proto @@ -61,6 +61,9 @@ message ClientStatusRequest { // Management server can use these match criteria to identify clients. // The match follows OR semantics. repeated type.matcher.v4alpha.NodeMatcher node_matchers = 1; + + // The node making the csds request. + config.core.v4alpha.Node node = 2; } // Detailed config (per xDS) with status. @@ -80,7 +83,6 @@ message PerXdsConfig { admin.v4alpha.ScopedRoutesConfigDump scoped_route_config = 5; - // [#not-implemented-hide:] admin.v4alpha.EndpointsConfigDump endpoint_config = 6; } } diff --git a/generated_api_shadow/envoy/service/status/v3/csds.proto b/generated_api_shadow/envoy/service/status/v3/csds.proto index beccfb8cb58e..23f1352bf489 100644 --- a/generated_api_shadow/envoy/service/status/v3/csds.proto +++ b/generated_api_shadow/envoy/service/status/v3/csds.proto @@ -61,6 +61,9 @@ message ClientStatusRequest { // Management server can use these match criteria to identify clients. // The match follows OR semantics. repeated type.matcher.v3.NodeMatcher node_matchers = 1; + + // The node making the csds request. + config.core.v3.Node node = 2; } // Detailed config (per xDS) with status. @@ -80,7 +83,6 @@ message PerXdsConfig { admin.v3.ScopedRoutesConfigDump scoped_route_config = 5; - // [#not-implemented-hide:] admin.v3.EndpointsConfigDump endpoint_config = 6; } } diff --git a/generated_api_shadow/envoy/service/status/v4alpha/csds.proto b/generated_api_shadow/envoy/service/status/v4alpha/csds.proto index 2286eb94a8a7..37758954cadb 100644 --- a/generated_api_shadow/envoy/service/status/v4alpha/csds.proto +++ b/generated_api_shadow/envoy/service/status/v4alpha/csds.proto @@ -61,6 +61,9 @@ message ClientStatusRequest { // Management server can use these match criteria to identify clients. // The match follows OR semantics. repeated type.matcher.v4alpha.NodeMatcher node_matchers = 1; + + // The node making the csds request. + config.core.v4alpha.Node node = 2; } // Detailed config (per xDS) with status. @@ -80,7 +83,6 @@ message PerXdsConfig { admin.v4alpha.ScopedRoutesConfigDump scoped_route_config = 5; - // [#not-implemented-hide:] admin.v4alpha.EndpointsConfigDump endpoint_config = 6; } }