Skip to content

envoy: keep ADS policy maps alive #1982

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

Open
nezdolik wants to merge 1 commit into
base: main
Choose a base branch
from
+64 −5
Open

envoy: keep ADS policy maps alive #1982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions cilium/bpf_metadata.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,13 +244,19 @@ Config::Config(const ::cilium::BpfMetadata& config,
fmt::format("cilium.bpf_metadata: ipv6_source_address is not an IPv6 address: {}",
config.ipv6_source_address()));
}
// Keep policy maps alive with the shared ADS stream to avoid leaving stale
// wildcard subscriptions when the last filter instance is destroyed.
const bool pin_for_ads =
config_source_.config_source_specifier_case() == envoy::config::core::v3::ConfigSource::kAds;

if (config.use_nphds()) {
hosts_ = context.serverFactoryContext().singletonManager().getTyped<Cilium::PolicyHostMap>(
SINGLETON_MANAGER_REGISTERED_NAME(cilium_host_map),
[&context, config_source = config_source_] {
return std::make_shared<Cilium::PolicyHostMap>(context.serverFactoryContext(),
config_source);
});
},
pin_for_ads);
// update desired config source on the map
hosts_->configure(config_source_);
}
Expand Down Expand Up @@ -293,7 +299,8 @@ Config::Config(const ::cilium::BpfMetadata& config,
SINGLETON_MANAGER_REGISTERED_NAME(cilium_network_policy),
[&context, config_source = config_source_] {
return std::make_shared<Cilium::NetworkPolicyMap>(context, config_source);
});
},
pin_for_ads);
// update desired config source on the map
npmap_->configure(config_source_);
}
Expand Down
58 changes: 55 additions & 3 deletions tests/bpf_metadata_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,14 +416,19 @@ class BpfMetadataIntegrationTest : public BaseIntegrationTest,
stream.sendGrpcMessage(response);
}

void sendNphdsResponse(FakeStream& stream, const std::string& version) {
void sendNphdsResponse(FakeStream& stream, const std::string& version,
const std::vector<std::string>& policy_host_configs = {policy_host1,
policy_host2}) {
envoy::service::discovery::v3::DiscoveryResponse response;
response.set_version_info(version);
response.set_nonce(version);
response.set_type_url(NetworkPolicyHostsTypeUrl);
std::vector<cilium::NetworkPolicyHosts> proto_configs;
proto_configs.emplace_back(TestUtility::parseYaml<cilium::NetworkPolicyHosts>(policy_host1));
proto_configs.emplace_back(TestUtility::parseYaml<cilium::NetworkPolicyHosts>(policy_host2));
proto_configs.reserve(policy_host_configs.size());
for (const auto& policy_host_config : policy_host_configs) {
proto_configs.emplace_back(
TestUtility::parseYaml<cilium::NetworkPolicyHosts>(policy_host_config));
}
for (const auto& policy_host_config : proto_configs) {
response.add_resources()->PackFrom(policy_host_config);
}
Comment thread
nezdolik marked this conversation as resolved.
Expand Down Expand Up @@ -597,6 +602,53 @@ TEST_P(BpfMetadataIntegrationTest, BpfMetadataWithNpdsAndNpdhsViaAds) {
test_server_->waitForCounterGe("cilium.hostmap.update_success", 1);
}

TEST_P(BpfMetadataIntegrationTest, AdsPolicyMapsSurviveLastListenerRemoval) {
on_server_init_function_ = [&]() {
createAdsStream();
addBpfMetadataListenerFilter(listener_config_, /*use_ads=*/true);
EXPECT_TRUE(compareDiscoveryRequest(
Config::TestTypeUrl::get().Cluster, "", {}, {}, {},
/*expect_node=*/true, Envoy::Grpc::Status::WellKnownGrpcStatus::Ok, "", ads_stream_.get()));
sendCdsResponse(*ads_stream_, "1");
EXPECT_TRUE(compareDiscoveryRequest(
Config::TestTypeUrl::get().Listener, "", {}, {}, {}, /*expect_node=*/false,
Grpc::Status::WellKnownGrpcStatus::Ok, "", ads_stream_.get()));
sendLdsResponse(*ads_stream_, {MessageUtil::getYamlStringFromMessage(listener_config_)}, "1");
};
initializeAds();

test_server_->waitForCounterGe("listener_manager.lds.update_success", 1);
sendNpdsResponse(*ads_stream_, "1");
test_server_->waitForCounterGe("cilium.policy.update_success", 1);
sendNphdsResponse(*ads_stream_, "1");
test_server_->waitForCounterGe("cilium.hostmap.update_success", 1);

{
const auto policy_map = networkPolicyMap();
EXPECT_TRUE(policy_map->exists("10.1.1.1"));
EXPECT_TRUE(policy_map->exists("10.2.2.2"));
}
EXPECT_EQ(resolveHostPolicyId("10.1.1.1"), 111);
EXPECT_EQ(resolveHostPolicyId("10.2.2.2"), 222);

sendLdsResponse(*ads_stream_, std::vector<envoy::config::listener::v3::Listener>{}, "2");
test_server_->waitForCounterGe("listener_manager.lds.update_success", 2);
test_server_->waitForCounterEq("listener_manager.listener_removed", 1);
test_server_->waitForGaugeEq("listener_manager.total_listeners_draining", 0);
EXPECT_TRUE(test_server_->server().listenerManager().listeners().empty());

sendNpdsResponse(*ads_stream_, "2", {policy2});
test_server_->waitForCounterGe("cilium.policy.update_success", 2);
sendNphdsResponse(*ads_stream_, "2", {policy_host2});
test_server_->waitForCounterGe("cilium.hostmap.update_success", 2);

const auto policy_map = networkPolicyMap();
EXPECT_FALSE(policy_map->exists("10.1.1.1"));
EXPECT_TRUE(policy_map->exists("10.2.2.2"));
EXPECT_EQ(resolveHostPolicyId("10.1.1.1"), Cilium::ID::UNKNOWN);
EXPECT_EQ(resolveHostPolicyId("10.2.2.2"), 222);
}

TEST_P(BpfMetadataIntegrationTest, PolicyStreamGenerationTracksAcceptedAdsGrpcStreams) {
on_server_init_function_ = [&]() {
createAdsStream();
Expand Down
Loading