From 8c746065cc0be46c93d5c296e64536b3bbe1c784 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Thu, 17 Jun 2021 16:05:37 +0530 Subject: [PATCH] revove v2 suport for hosts Signed-off-by: Abhay Narayan Katare --- source/common/upstream/static_cluster.cc | 2 +- source/common/upstream/static_cluster.h | 2 +- test/common/config/version_converter_test.cc | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/source/common/upstream/static_cluster.cc b/source/common/upstream/static_cluster.cc index 12fa3999b5524..9f3e878f19fe5 100644 --- a/source/common/upstream/static_cluster.cc +++ b/source/common/upstream/static_cluster.cc @@ -19,7 +19,7 @@ StaticClusterImpl::StaticClusterImpl( const envoy::config::endpoint::v3::ClusterLoadAssignment cluster_load_assignment( cluster.has_load_assignment() ? cluster.load_assignment() - : Config::Utility::translateClusterHosts(cluster.hidden_envoy_deprecated_hosts())); + : Config::Utility::translateClusterHosts(& hosts)); overprovisioning_factor_ = PROTOBUF_GET_WRAPPED_OR_DEFAULT( cluster_load_assignment.policy(), overprovisioning_factor, kDefaultOverProvisioningFactor); diff --git a/source/common/upstream/static_cluster.h b/source/common/upstream/static_cluster.h index b5de7b76b8dd6..26ea78ad1c96f 100644 --- a/source/common/upstream/static_cluster.h +++ b/source/common/upstream/static_cluster.h @@ -24,7 +24,7 @@ class StaticClusterImpl : public ClusterImplBase { private: // ClusterImplBase void startPreInit() override; - + const Protobuf::RepeatedPtrField hosts; PriorityStateManagerPtr priority_state_manager_; uint32_t overprovisioning_factor_; }; diff --git a/test/common/config/version_converter_test.cc b/test/common/config/version_converter_test.cc index 1c7e949fb6257..b69f9dd3f20a1 100644 --- a/test/common/config/version_converter_test.cc +++ b/test/common/config/version_converter_test.cc @@ -42,7 +42,6 @@ TEST(VersionConverterTest, Upgrade) { // Verify fields in v3 Cluster. EXPECT_TRUE(hasOriginalTypeInformation(dst)); EXPECT_FALSE(dst.hidden_envoy_deprecated_hosts().empty()); - EXPECT_FALSE(hasOriginalTypeInformation(dst.hidden_envoy_deprecated_hosts(0))); EXPECT_EQ("bar", dst.load_assignment().cluster_name()); EXPECT_FALSE(hasOriginalTypeInformation(dst.load_assignment())); EXPECT_EQ("foo", dst.eds_cluster_config().service_name());