diff --git a/api/envoy/api/v2/cds.proto b/api/envoy/api/v2/cds.proto index 647a5015063f..6f98e1bcc6e2 100644 --- a/api/envoy/api/v2/cds.proto +++ b/api/envoy/api/v2/cds.proto @@ -553,7 +553,8 @@ message Cluster { // the first update happens. This is useful for big clusters, with potentially noisy deploys // that might trigger excessive CPU usage due to a constant stream of healthcheck state changes // or metadata updates. The first set of updates to be seen apply immediately (e.g.: a new - // cluster). + // cluster). Please always keep in mind that the use of sandbox technologies may change this + // behavior. // // If this is not set, we default to a merge window of 1000ms. To disable it, set the merge // window to 0. diff --git a/source/common/upstream/cluster_manager_impl.h b/source/common/upstream/cluster_manager_impl.h index ae0ecb2dbd40..f00088deb7a7 100644 --- a/source/common/upstream/cluster_manager_impl.h +++ b/source/common/upstream/cluster_manager_impl.h @@ -419,9 +419,13 @@ class ClusterManagerImpl : public ClusterManager, Logger::Loggable