Adjust cilium custom filters

Signed-off-by: Tam Mach <[email protected]>

Author: sayboras

cilium/grpc_subscription.cc

@@ -183,13 +183,13 @@ subscribe(const std::string& type_url, const LocalInfo::LocalInfo& local_info,
           Config::SubscriptionFactory::RetryInitialDelayMs,
           Config::SubscriptionFactory::RetryMaxDelayMs, random),
       /*target_xds_authority_=*/"",
-      /*eds_resources_cache_=*/nullptr // EDS cache is only used for ADS.
+      /*eds_resources_cache_=*/nullptr, // EDS cache is only used for ADS.
+      /*skip_subsequent_node_=*/api_config_source.set_node_on_first_message_only(),
   };
 
   return std::make_unique<Config::GrpcSubscriptionImpl>(
-      std::make_shared<GrpcMuxImpl>(grpc_mux_context,
-                                    api_config_source.set_node_on_first_message_only()),
-      callbacks, resource_decoder, stats, type_url, dispatcher, init_fetch_timeout,
+      std::make_shared<GrpcMuxImpl>(grpc_mux_context), callbacks, resource_decoder, stats, type_url,
+      dispatcher, init_fetch_timeout,
       /*is_aggregated*/ false, options);
 }
 

cilium/grpc_subscription.h

@@ -25,8 +25,8 @@ extern envoy::config::core::v3::ConfigSource cilium_xds_api_config;
 // GrpcMux wrapper to get access to control plane identifier
 class GrpcMuxImpl : public Config::GrpcMuxImpl {
 public:
-  GrpcMuxImpl(Config::GrpcMuxContext& grpc_mux_context, bool skip_subsequent_node)
-      : Config::GrpcMuxImpl(grpc_mux_context, skip_subsequent_node) {}
+  explicit GrpcMuxImpl(Config::GrpcMuxContext& grpc_mux_context)
+      : Config::GrpcMuxImpl(grpc_mux_context) {}
 
   ~GrpcMuxImpl() override = default;
 

cilium/secret_watcher.cc

@@ -156,15 +156,14 @@ DownstreamTLSContext::DownstreamTLSContext(const NetworkPolicyMapImpl& parent,
     server_names_.emplace_back(config.server_names(i));
   }
   auto server_config_or_error = Extensions::TransportSockets::Tls::ServerContextConfigImpl::create(
-      context_config, parent.transportFactoryContext(), false);
+      context_config, parent.transportFactoryContext(), server_names_, false);
   // NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
   THROW_IF_NOT_OK(server_config_or_error.status());
   server_config_ = std::move(server_config_or_error.value());
 
   auto create_server_context = [this]() {
     ENVOY_LOG(debug, "Server secret is updated.");
-    auto ctx_or_error =
-        manager_.createSslServerContext(scope_, *server_config_, server_names_, nullptr);
+    auto ctx_or_error = manager_.createSslServerContext(scope_, *server_config_, nullptr);
     // NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
     THROW_IF_NOT_OK(ctx_or_error.status());
     auto ctx = std::move(ctx_or_error.value());