From bca577100191d63f5d4a95c68030c538f221fd33 Mon Sep 17 00:00:00 2001
From: Abhay Narayan Katare <abhay.katare@india.nec.com>
Date: Thu, 17 Jun 2021 16:27:05 +0530
Subject: [PATCH 1/2] remove v2 support for hosts from logical_dns_cluster.cc

Signed-off-by: Abhay Narayan Katare <abhay.katare@india.nec.com>
---
 source/common/upstream/logical_dns_cluster.cc | 7 +++++++
 source/common/upstream/logical_dns_cluster.h  | 1 +
 2 files changed, 8 insertions(+)

diff --git a/source/common/upstream/logical_dns_cluster.cc b/source/common/upstream/logical_dns_cluster.cc
index 5176573e3ab4b..22a5baaa2f4cd 100644
--- a/source/common/upstream/logical_dns_cluster.cc
+++ b/source/common/upstream/logical_dns_cluster.cc
@@ -57,7 +57,14 @@ LogicalDnsCluster::LogicalDnsCluster(
       resolve_timer_(
           factory_context.dispatcher().createTimer([this]() -> void { startResolve(); })),
       local_info_(factory_context.localInfo()),
+<<<<<<< Updated upstream
       load_assignment_(convertPriority(cluster.load_assignment())) {
+=======
+      load_assignment_(
+          cluster.has_load_assignment()
+              ? convertPriority(cluster.load_assignment())
+              : Config::Utility::translateClusterHosts(& hosts)) {
+>>>>>>> Stashed changes
   failure_backoff_strategy_ =
       Config::Utility::prepareDnsRefreshStrategy<envoy::config::cluster::v3::Cluster>(
           cluster, dns_refresh_rate_ms_.count(), factory_context.api().randomGenerator());
diff --git a/source/common/upstream/logical_dns_cluster.h b/source/common/upstream/logical_dns_cluster.h
index b2d13cbc9b515..3ccdada8d57bd 100644
--- a/source/common/upstream/logical_dns_cluster.h
+++ b/source/common/upstream/logical_dns_cluster.h
@@ -74,6 +74,7 @@ class LogicalDnsCluster : public ClusterImplBase {
   Network::ActiveDnsQuery* active_dns_query_{};
   const LocalInfo::LocalInfo& local_info_;
   const envoy::config::endpoint::v3::ClusterLoadAssignment load_assignment_;
+  const Protobuf::RepeatedPtrField<envoy::config::core::v3::Address> hosts;
 };
 
 class LogicalDnsClusterFactory : public ClusterFactoryImplBase {

From 8af15288f8b2013f303a55140e18d03b2749485f Mon Sep 17 00:00:00 2001
From: Abhay Narayan Katare <abhay.katare@india.nec.com>
Date: Thu, 17 Jun 2021 17:44:40 +0530
Subject: [PATCH 2/2] fixing build issues

Signed-off-by: Abhay Narayan Katare <abhay.katare@india.nec.com>
---
 source/common/upstream/logical_dns_cluster.cc | 7 -------
 source/common/upstream/logical_dns_cluster.h  | 1 -
 2 files changed, 8 deletions(-)

diff --git a/source/common/upstream/logical_dns_cluster.cc b/source/common/upstream/logical_dns_cluster.cc
index 22a5baaa2f4cd..5176573e3ab4b 100644
--- a/source/common/upstream/logical_dns_cluster.cc
+++ b/source/common/upstream/logical_dns_cluster.cc
@@ -57,14 +57,7 @@ LogicalDnsCluster::LogicalDnsCluster(
       resolve_timer_(
           factory_context.dispatcher().createTimer([this]() -> void { startResolve(); })),
       local_info_(factory_context.localInfo()),
-<<<<<<< Updated upstream
       load_assignment_(convertPriority(cluster.load_assignment())) {
-=======
-      load_assignment_(
-          cluster.has_load_assignment()
-              ? convertPriority(cluster.load_assignment())
-              : Config::Utility::translateClusterHosts(& hosts)) {
->>>>>>> Stashed changes
   failure_backoff_strategy_ =
       Config::Utility::prepareDnsRefreshStrategy<envoy::config::cluster::v3::Cluster>(
           cluster, dns_refresh_rate_ms_.count(), factory_context.api().randomGenerator());
diff --git a/source/common/upstream/logical_dns_cluster.h b/source/common/upstream/logical_dns_cluster.h
index 3ccdada8d57bd..b2d13cbc9b515 100644
--- a/source/common/upstream/logical_dns_cluster.h
+++ b/source/common/upstream/logical_dns_cluster.h
@@ -74,7 +74,6 @@ class LogicalDnsCluster : public ClusterImplBase {
   Network::ActiveDnsQuery* active_dns_query_{};
   const LocalInfo::LocalInfo& local_info_;
   const envoy::config::endpoint::v3::ClusterLoadAssignment load_assignment_;
-  const Protobuf::RepeatedPtrField<envoy::config::core::v3::Address> hosts;
 };
 
 class LogicalDnsClusterFactory : public ClusterFactoryImplBase {