From bdba4bba15fc81508ab24d1239a607d6b7cbabb2 Mon Sep 17 00:00:00 2001
From: "update-envoy[bot]"
 <135279899+update-envoy[bot]@users.noreply.github.com>
Date: Wed, 10 Apr 2024 14:56:47 +0000
Subject: [PATCH] Mirrored from envoyproxy/envoy @
 dffc5f1d389c6f8601b790fbcbc40236f58522f6

Signed-off-by: update-envoy[bot] <135279899+update-envoy[bot]@users.noreply.github.com>
---
 envoy/COMMIT                                               | 2 +-
 envoy/extensions/filters/http/composite/v3/composite.pb.go | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/envoy/COMMIT b/envoy/COMMIT
index 240afa1ae9..e21137aaa6 100644
--- a/envoy/COMMIT
+++ b/envoy/COMMIT
@@ -1 +1 @@
-5f6842890c67bdadab129a78bf2e521068d69f61
+dffc5f1d389c6f8601b790fbcbc40236f58522f6
diff --git a/envoy/extensions/filters/http/composite/v3/composite.pb.go b/envoy/extensions/filters/http/composite/v3/composite.pb.go
index 21b2281ccb..a4fc5ca979 100755
--- a/envoy/extensions/filters/http/composite/v3/composite.pb.go
+++ b/envoy/extensions/filters/http/composite/v3/composite.pb.go
@@ -143,9 +143,11 @@ type ExecuteFilterAction struct {
 	// Only one of “typed_config“ or “dynamic_config“ can be set.
 	// [#extension-category: envoy.filters.http]
 	TypedConfig *v3.TypedExtensionConfig `protobuf:"bytes,1,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"`
-	// Dynamic configuration of filter obtained via extension configuration discovery
-	// service.
+	// Dynamic configuration of filter obtained via extension configuration discovery service.
 	// Only one of “typed_config“ or “dynamic_config“ can be set.
+	// When composite filter is in upstream filter chain, the “dynamic_config“
+	// can not be set. TBD: Refactor cluster manager init sequence to Support this.
+	// Please check https://github.com/envoyproxy/envoy/issues/33218 for details.
 	DynamicConfig *DynamicConfig `protobuf:"bytes,2,opt,name=dynamic_config,json=dynamicConfig,proto3" json:"dynamic_config,omitempty"`
 }