From f68464f6afbd4cc5b939a0922be039bd34bffc82 Mon Sep 17 00:00:00 2001
From: "data-plane-api(Azure Pipelines)"
 <data-plane-api@users.noreply.github.com>
Date: Wed, 24 Nov 2021 15:09:39 +0000
Subject: [PATCH] Listener: Add global conn limit opt out. (#18876)

Signed-off-by: Weston Carlson <wez470@gmail.com>

Mirrored from https://github.com/envoyproxy/envoy @ e903a6e3adcc21618cb2315c58699b3f0d04c42b
---
 envoy/config/bootstrap/v3/bootstrap.proto | 6 +++++-
 envoy/config/listener/v3/listener.proto   | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/envoy/config/bootstrap/v3/bootstrap.proto b/envoy/config/bootstrap/v3/bootstrap.proto
index 0cb494e1..d056ba74 100644
--- a/envoy/config/bootstrap/v3/bootstrap.proto
+++ b/envoy/config/bootstrap/v3/bootstrap.proto
@@ -329,7 +329,7 @@ message Bootstrap {
 
 // Administration interface :ref:`operations documentation
 // <operations_admin_interface>`.
-// [#next-free-field: 6]
+// [#next-free-field: 7]
 message Admin {
   option (udpa.annotations.versioning).previous_message_type = "envoy.config.bootstrap.v2.Admin";
 
@@ -355,6 +355,10 @@ message Admin {
   // Additional socket options that may not be present in Envoy source code or
   // precompiled binaries.
   repeated core.v3.SocketOption socket_options = 4;
+
+  // Indicates whether :ref:`global_downstream_max_connections <config_overload_manager_limiting_connections>`
+  // should apply to the admin interface or not.
+  bool ignore_global_conn_limit = 6;
 }
 
 // Cluster manager :ref:`architecture overview <arch_overview_cluster_manager>`.
diff --git a/envoy/config/listener/v3/listener.proto b/envoy/config/listener/v3/listener.proto
index f065ff67..a207875c 100644
--- a/envoy/config/listener/v3/listener.proto
+++ b/envoy/config/listener/v3/listener.proto
@@ -35,7 +35,7 @@ message ListenerCollection {
   repeated xds.core.v3.CollectionEntry entries = 1;
 }
 
-// [#next-free-field: 31]
+// [#next-free-field: 32]
 message Listener {
   option (udpa.annotations.versioning).previous_message_type = "envoy.api.v2.Listener";
 
@@ -318,4 +318,8 @@ message Listener {
   // Enable MPTCP (multi-path TCP) on this listener. Clients will be allowed to establish
   // MPTCP connections. Non-MPTCP clients will fall back to regular TCP.
   bool enable_mptcp = 30;
+
+  // Whether the listener should limit connections based upon the value of
+  // :ref:`global_downstream_max_connections <config_overload_manager_limiting_connections>`.
+  bool ignore_global_conn_limit = 31;
 }