Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xDS: type url aggregation #9649

Merged
merged 15 commits into from
Mar 18, 2020
Merged

xDS: type url aggregation #9649

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6bd8479
aggregate xDS resource names
Shikugawa Jan 9, 2020
b548488
delete unused classes
Shikugawa Jan 10, 2020
98d126e
delete unused headers
Shikugawa Jan 10, 2020
6aa3332
Kick CI
Shikugawa Jan 10, 2020
f4be81e
resource name -> type url
Shikugawa Jan 12, 2020
77e976e
fix
Shikugawa Jan 12, 2020
1ac3c7f
Kick CI
Shikugawa Jan 12, 2020
7a9cd2f
add getResourceName()
Shikugawa Jan 23, 2020
217d979
fix
Shikugawa Feb 6, 2020
f1cceb5
fix build error
Shikugawa Feb 6, 2020
3cbf679
eliminate v2 api lib bundling
Shikugawa Mar 7, 2020
e156876
delete unused API_NO_BOOST
Shikugawa Mar 13, 2020
f0444b7
Kick CI
Shikugawa Mar 13, 2020
26e6ba9
rename
Shikugawa Mar 16, 2020
9bc83dd
Kick CI
Shikugawa Mar 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix build error 
Signed-off-by: shikugawa <[email protected]>
  • Loading branch information
@Shikugawa
Shikugawa committed Feb 6, 2020
commit f1cceb5c5aeb72354465128dde586e88e6cf3d77
7 changes: 4 additions & 3 deletions include/envoy/config/discovery_service_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#include "envoy/service/discovery/v2/rtds.pb.h"
#include "envoy/service/runtime/v3/rtds.pb.h"

namespace Envoy {
namespace Config {
template <typename Prev, typename Current>
struct SubscriptionBase : public Config::SubscriptionCallbacks {
static std::string getResourceName(envoy::config::core::v3::ApiVersion resource_api_version) {
Expand All @@ -36,12 +38,11 @@ struct SubscriptionBase : public Config::SubscriptionCallbacks {
}
}
};

namespace Envoy {
namespace Config {
using RdsRouteConfigSubscriptionBase =
SubscriptionBase<envoy::api::v2::RouteConfiguration,
envoy::config::route::v3::RouteConfiguration>;
using RtdsSubscriptionBase =
SubscriptionBase<envoy::service::discovery::v2::Runtime, envoy::service::runtime::v3::Runtime>;
using ScopedRdsConfigSubscriptionBase =
SubscriptionBase<envoy::api::v2::ScopedRouteConfiguration,
envoy::config::route::v3::ScopedRouteConfiguration>;
Expand Down