Skip to content

policy: Hold listeners until the first network policy update #2084

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
firecow wants to merge 3 commits into
base: main
Choose a base branch
from
Open

policy: Hold listeners until the first network policy update #2084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
816569f
policy: Hold listeners until the first network policy update
firecow Oct 9, 2026
e876501
Merge branch 'main' into first-policy-gates-listener-main
firecow Oct 9, 2026
7a879ff
Merge branch 'main' into first-policy-gates-listener-main
firecow Oct 11, 2026
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
1 change: 1 addition & 0 deletions cilium/bpf_metadata.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@ Config::Config(const ::cilium::BpfMetadata& config,
pin_for_ads);
// update desired config source on the map
npmap_->configure(config_source_);
npmap_->addListenerInitTarget(context.initManager());
}
}

Expand Down
18 changes: 18 additions & 0 deletions cilium/network_policy.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include <algorithm>
#include <atomic>
#include <chrono>
#include <cstdint>
#include <format>
#include <functional>
Expand All @@ -25,6 +26,7 @@
#include "envoy/config/core/v3/base.pb.h"
#include "envoy/config/core/v3/config_source.pb.h"
#include "envoy/config/subscription.h"
#include "envoy/event/timer.h"
#include "envoy/http/header_map.h"
#include "envoy/init/manager.h"
#include "envoy/network/address.h"
Expand Down Expand Up @@ -427,6 +429,8 @@ class NetworkPolicyMapImpl : public ManagedGrpcSubscription {

// init target which starts gRPC subscription
Init::TargetImpl init_target_;
Init::SharedTargetImpl initial_policy_target_{"Cilium NetworkPolicy first update", []() {}};
Event::TimerPtr initial_policy_timer_;
std::shared_ptr<Server::Configuration::TransportSocketFactoryContextImpl>
transport_factory_context_;
// Declared after transport_factory_context_ so that the cache, which retains a shared reference
Expand Down Expand Up @@ -1948,6 +1952,10 @@ NetworkPolicyMap::~NetworkPolicyMap() {
context_.mainThreadDispatcher().post([impl = std::move(impl_)]() mutable { impl.reset(); });
}

void NetworkPolicyMap::addListenerInitTarget(Init::Manager& listener_init_manager) {
listener_init_manager.add(impl_->initial_policy_target_);
}

bool NetworkPolicyMap::exists(const std::string& endpoint_policy_name) const {
return impl_->getPolicyInstanceImpl(endpoint_policy_name);
}
Expand Down Expand Up @@ -2000,6 +2008,14 @@ NetworkPolicyMapImpl::NetworkPolicyMapImpl(
store(new PolicyMapSnapshot());
ENVOY_LOG(trace, "NetworkPolicyMapImpl({}) created.", instance_id_);

initial_policy_timer_ = context_.mainThreadDispatcher().createTimer([this]() {
if (initial_policy_target_.ready()) {
ENVOY_LOG(warn, "Cilium NetworkPolicy: no policy update within 5 seconds, starting listeners "
"without network policy");
}
});
initial_policy_timer_->enableTimer(std::chrono::seconds(5));

if (context_.admin().has_value()) {
ENVOY_LOG(debug, "Registering NetworkPolicies to config tracker");
config_tracker_entry_ = context_.admin()->getConfigTracker().add(
Expand Down Expand Up @@ -2228,6 +2244,7 @@ absl::Status NetworkPolicyMapImpl::onConfigUpdate(

installNewPolicyMap(std::move(pending_resource_map), version_init_manager,
std::move(version_name), policy_stream_state);
initial_policy_target_.ready();
return absl::OkStatus();
}

Expand Down Expand Up @@ -2340,6 +2357,7 @@ absl::Status NetworkPolicyMapImpl::onConfigUpdate(
}
installNewPolicyMap(std::move(pending_resource_map), version_init_manager,
std::move(version_name), policy_stream_state);
initial_policy_target_.ready();
return absl::OkStatus();
}

Expand Down
2 changes: 2 additions & 0 deletions cilium/network_policy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "envoy/config/core/v3/config_source.pb.h"
#include "envoy/config/subscription.h"
#include "envoy/http/header_map.h"
#include "envoy/init/manager.h"
#include "envoy/network/address.h"
#include "envoy/protobuf/message_validator.h"
#include "envoy/server/factory_context.h"
Expand Down Expand Up @@ -202,6 +203,7 @@ class NetworkPolicyMap : public Singleton::Instance, public Logger::Loggable<Log

bool exists(const std::string& endpoint_policy_name) const;
void configure(const envoy::config::core::v3::ConfigSource& config_source);
void addListenerInitTarget(Init::Manager& listener_init_manager);

const PolicyInstance& getPolicyInstance(const std::string& endpoint_policy_name,
bool allow_egress) const;
Expand Down
48 changes: 48 additions & 0 deletions tests/cilium_network_policy_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,14 @@
#include "source/common/common/logger.h"
#include "source/common/common/regex.h"
#include "source/common/config/decoded_resource_impl.h"
#include "source/common/init/manager_impl.h"
#include "source/common/init/watcher_impl.h"
#include "source/common/protobuf/message_validator_impl.h"
#include "source/common/protobuf/utility.h"
#include "source/common/secret/sds_api.h" // NOLINT

#include "test/common/stats/stat_test_utility.h"
#include "test/mocks/event/mocks.h"
#include "test/mocks/secret/mocks.h"
#include "test/mocks/server/admin.h"
#include "test/mocks/server/factory_context.h"
Expand Down Expand Up @@ -112,6 +115,8 @@ class CiliumNetworkPolicyTest : public ::testing::Test {
ON_CALL_SDS_SECRET_PROVIDER(secret_manager_, TlsSessionTicketKeysContext, TlsSessionTicketKeys);
ON_CALL_SDS_SECRET_PROVIDER_OPT_INIT(secret_manager_, GenericSecret, GenericSecret);

initial_policy_timer_ =
new NiceMock<Event::MockTimer>(&factory_context_.server_factory_context_.dispatcher_);
policy_map_ =
std::make_shared<NetworkPolicyMap>(factory_context_, Cilium::CILIUM_XDS_API_CONFIG, false);
}
Expand Down Expand Up @@ -279,6 +284,7 @@ class CiliumNetworkPolicyTest : public ::testing::Test {
NiceMock<Server::Configuration::MockFactoryContext> factory_context_;
NiceMock<Secret::MockSecretManager> secret_manager_;
std::shared_ptr<NetworkPolicyMap> policy_map_;
NiceMock<Event::MockTimer>* initial_policy_timer_;
NiceMock<Stats::TestUtil::TestStore> store_;
uint16_t proxy_id_ = 42;
};
Expand All @@ -287,6 +293,48 @@ TEST_F(CiliumNetworkPolicyTest, UpdatesRejectedStatName) {
EXPECT_EQ("cilium.policy.updates_rejected", updatesRejectedStatName());
}

TEST_F(CiliumNetworkPolicyTest, ListenerInitWaitsForFirstPolicyUpdate) {
Init::ManagerImpl listener_init_manager("listener");
policy_map_->addListenerInitTarget(listener_init_manager);
bool initialized = false;
Init::WatcherImpl listener_watcher("listener", [&initialized]() { initialized = true; });
listener_init_manager.initialize(listener_watcher);
EXPECT_FALSE(initialized);
EXPECT_TRUE(subscriptionCallbacks().onConfigUpdate({}, "1").ok());
EXPECT_TRUE(initialized);
}

TEST_F(CiliumNetworkPolicyTest, ListenerInitStartedAfterFirstPolicyUpdateDoesNotWait) {
Init::ManagerImpl listener_init_manager("listener");
policy_map_->addListenerInitTarget(listener_init_manager);
EXPECT_TRUE(subscriptionCallbacks().onConfigUpdate({}, "1").ok());
bool initialized = false;
Init::WatcherImpl listener_watcher("listener", [&initialized]() { initialized = true; });
listener_init_manager.initialize(listener_watcher);
EXPECT_TRUE(initialized);
}

TEST_F(CiliumNetworkPolicyTest, ListenerAddedAfterFirstPolicyUpdateDoesNotWait) {
EXPECT_TRUE(subscriptionCallbacks().onConfigUpdate({}, "1").ok());
Init::ManagerImpl listener_init_manager("listener");
policy_map_->addListenerInitTarget(listener_init_manager);
bool initialized = false;
Init::WatcherImpl listener_watcher("listener", [&initialized]() { initialized = true; });
listener_init_manager.initialize(listener_watcher);
EXPECT_TRUE(initialized);
}

TEST_F(CiliumNetworkPolicyTest, ListenerInitWaitsUntilFirstPolicyUpdateTimeout) {
Init::ManagerImpl listener_init_manager("listener");
policy_map_->addListenerInitTarget(listener_init_manager);
bool initialized = false;
Init::WatcherImpl listener_watcher("listener", [&initialized]() { initialized = true; });
listener_init_manager.initialize(listener_watcher);
EXPECT_FALSE(initialized);
initial_policy_timer_->invokeCallback();
EXPECT_TRUE(initialized);
}

TEST_F(CiliumNetworkPolicyTest, EmptyPolicyUpdate) {
EXPECT_TRUE(subscriptionCallbacks().onConfigUpdate({}, "1").ok());
EXPECT_FALSE(validate("10.1.2.3", "")); // Policy not found
Expand Down