From 71560da02866ca8f73b4a480f0cc5ab5a40db390 Mon Sep 17 00:00:00 2001
From: "data-plane-api(Azure Pipelines)"
 <data-plane-api@users.noreply.github.com>
Date: Wed, 3 Feb 2021 03:27:16 +0000
Subject: [PATCH] delta-xds: add control_plane to DeltaDiscoveryResponse (v3
 up) (#14892)

#14891

Risk Level: LOW (only adding new field)

Signed-off-by: Xin Zhuang <stevenzzz@google.com>
Co-authored-by: Lizan Zhou <lizan@tetrate.io>

Mirrored from https://github.com/envoyproxy/envoy @ d61fdbabbf0010a1769c10a87b63e32969f6efb6
---
 envoy/service/discovery/v3/discovery.proto      | 7 +++++--
 envoy/service/discovery/v4alpha/discovery.proto | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/envoy/service/discovery/v3/discovery.proto b/envoy/service/discovery/v3/discovery.proto
index b61da974..288fd093 100644
--- a/envoy/service/discovery/v3/discovery.proto
+++ b/envoy/service/discovery/v3/discovery.proto
@@ -105,7 +105,6 @@ message DiscoveryResponse {
   // required for non-stream based xDS implementations.
   string nonce = 5;
 
-  // [#not-implemented-hide:]
   // The control plane instance that sent the response.
   config.core.v3.ControlPlane control_plane = 6;
 }
@@ -203,7 +202,7 @@ message DeltaDiscoveryRequest {
   google.rpc.Status error_detail = 7;
 }
 
-// [#next-free-field: 7]
+// [#next-free-field: 8]
 message DeltaDiscoveryResponse {
   option (udpa.annotations.versioning).previous_message_type =
       "envoy.api.v2.DeltaDiscoveryResponse";
@@ -228,6 +227,10 @@ message DeltaDiscoveryResponse {
   // The nonce provides a way for DeltaDiscoveryRequests to uniquely
   // reference a DeltaDiscoveryResponse when (N)ACKing. The nonce is required.
   string nonce = 5;
+
+  // [#not-implemented-hide:]
+  // The control plane instance that sent the response.
+  config.core.v3.ControlPlane control_plane = 7;
 }
 
 // [#next-free-field: 8]
diff --git a/envoy/service/discovery/v4alpha/discovery.proto b/envoy/service/discovery/v4alpha/discovery.proto
index f292718a..514eefb3 100644
--- a/envoy/service/discovery/v4alpha/discovery.proto
+++ b/envoy/service/discovery/v4alpha/discovery.proto
@@ -106,7 +106,6 @@ message DiscoveryResponse {
   // required for non-stream based xDS implementations.
   string nonce = 5;
 
-  // [#not-implemented-hide:]
   // The control plane instance that sent the response.
   config.core.v4alpha.ControlPlane control_plane = 6;
 }
@@ -205,7 +204,7 @@ message DeltaDiscoveryRequest {
   google.rpc.Status error_detail = 7;
 }
 
-// [#next-free-field: 7]
+// [#next-free-field: 8]
 message DeltaDiscoveryResponse {
   option (udpa.annotations.versioning).previous_message_type =
       "envoy.service.discovery.v3.DeltaDiscoveryResponse";
@@ -230,6 +229,10 @@ message DeltaDiscoveryResponse {
   // The nonce provides a way for DeltaDiscoveryRequests to uniquely
   // reference a DeltaDiscoveryResponse when (N)ACKing. The nonce is required.
   string nonce = 5;
+
+  // [#not-implemented-hide:]
+  // The control plane instance that sent the response.
+  config.core.v4alpha.ControlPlane control_plane = 7;
 }
 
 // [#next-free-field: 8]