From f86cb6df2d2ed4c94e9179bddda4f4109dbe3a65 Mon Sep 17 00:00:00 2001
From: Knative Automation <automation@knative.team>
Date: Wed, 15 May 2024 13:39:05 +0000
Subject: [PATCH] upgrade to latest dependencies

bumping knative.dev/networking 25012a4...4e598f4:
  > 4e598f4 upgrade to latest dependencies (# 981)
  > b31855c upgrade to latest dependencies (# 980)
bumping knative.dev/pkg b1fd04d...11a3d46:
  > 11a3d46 Add composite ConfigStore to combine multiple ConfigStore (# 3027)

Signed-off-by: Knative Automation <automation@knative.team>
---
 go.mod                                           |  4 ++--
 go.sum                                           |  8 ++++----
 vendor/knative.dev/pkg/reconciler/configstore.go | 16 +++++++++++++++-
 vendor/modules.txt                               |  4 ++--
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/go.mod b/go.mod
index 34a827a8d..e20e98719 100644
--- a/go.mod
+++ b/go.mod
@@ -14,8 +14,8 @@ require (
 	k8s.io/code-generator v0.29.3
 	k8s.io/utils v0.0.0-20240102154912-e7106e64919e
 	knative.dev/hack v0.0.0-20240507013718-68e3bfb39d11
-	knative.dev/networking v0.0.0-20240508055612-25012a498278
-	knative.dev/pkg v0.0.0-20240513091600-b1fd04d5c458
+	knative.dev/networking v0.0.0-20240515132013-4e598f42f4c2
+	knative.dev/pkg v0.0.0-20240515073057-11a3d46fe4d6
 	sigs.k8s.io/gateway-api v1.0.1-0.20240422224228-29e68bffffb9
 	sigs.k8s.io/yaml v1.4.0
 )
diff --git a/go.sum b/go.sum
index 330dfb212..d1f865912 100644
--- a/go.sum
+++ b/go.sum
@@ -677,10 +677,10 @@ k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCf
 k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 knative.dev/hack v0.0.0-20240507013718-68e3bfb39d11 h1:CYoD72R8/R35REjeY2nnWfBak+Q3f+NxXwEfwcID1eU=
 knative.dev/hack v0.0.0-20240507013718-68e3bfb39d11/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
-knative.dev/networking v0.0.0-20240508055612-25012a498278 h1:uToI/YqBS1oQ0XIgcNXpAJ0qdeghBN/rREPYN/nwtNs=
-knative.dev/networking v0.0.0-20240508055612-25012a498278/go.mod h1:ySd8prgXDd7V5wEE80T800yeBOfVncAWp3nFTbZl34I=
-knative.dev/pkg v0.0.0-20240513091600-b1fd04d5c458 h1:ESofRToj3xFQfKd5rlwd3EHd7G/CbVpchrUsw1HzI1w=
-knative.dev/pkg v0.0.0-20240513091600-b1fd04d5c458/go.mod h1:fkgcK/71v1QSJza7pCOxtuk7zSsWYPQ7eiuX8M2wXxs=
+knative.dev/networking v0.0.0-20240515132013-4e598f42f4c2 h1:vFl9mUoUICknl2m7RBqf1NSE1VENxfANTr+btIzzOU8=
+knative.dev/networking v0.0.0-20240515132013-4e598f42f4c2/go.mod h1:bKoqFoKxbixmcRyN8LKt4ye+tyZ/NNw2xmcyFU03lsM=
+knative.dev/pkg v0.0.0-20240515073057-11a3d46fe4d6 h1:mUZ3ZrZFIfHtaILKPodBX1WnFQVpVSdA+e0DaUqIe30=
+knative.dev/pkg v0.0.0-20240515073057-11a3d46fe4d6/go.mod h1:fkgcK/71v1QSJza7pCOxtuk7zSsWYPQ7eiuX8M2wXxs=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
diff --git a/vendor/knative.dev/pkg/reconciler/configstore.go b/vendor/knative.dev/pkg/reconciler/configstore.go
index c5c9c319f..6b61856d5 100644
--- a/vendor/knative.dev/pkg/reconciler/configstore.go
+++ b/vendor/knative.dev/pkg/reconciler/configstore.go
@@ -20,6 +20,20 @@ import "context"
 
 // ConfigStore is used to attach the frozen configuration to the context.
 type ConfigStore interface {
-	// ConfigStore is used to attach the frozen configuration to the context.
+	// ToContext is used to attach the frozen configuration to the context.
 	ToContext(ctx context.Context) context.Context
 }
+
+// ConfigStores is used to combine multiple ConfigStore and attach multiple frozen configurations
+// to the context.
+type ConfigStores []ConfigStore
+
+// ConfigStores implements ConfigStore interface.
+var _ ConfigStore = ConfigStores{}
+
+func (stores ConfigStores) ToContext(ctx context.Context) context.Context {
+	for _, s := range stores {
+		ctx = s.ToContext(ctx)
+	}
+	return ctx
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 77c8dbe3c..b05de01e9 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -890,7 +890,7 @@ k8s.io/utils/trace
 # knative.dev/hack v0.0.0-20240507013718-68e3bfb39d11
 ## explicit; go 1.18
 knative.dev/hack
-# knative.dev/networking v0.0.0-20240508055612-25012a498278
+# knative.dev/networking v0.0.0-20240515132013-4e598f42f4c2
 ## explicit; go 1.21
 knative.dev/networking/config
 knative.dev/networking/pkg
@@ -934,7 +934,7 @@ knative.dev/networking/test/test_images/runtime/handlers
 knative.dev/networking/test/test_images/timeout
 knative.dev/networking/test/test_images/wsserver
 knative.dev/networking/test/types
-# knative.dev/pkg v0.0.0-20240513091600-b1fd04d5c458
+# knative.dev/pkg v0.0.0-20240515073057-11a3d46fe4d6
 ## explicit; go 1.21
 knative.dev/pkg/apis
 knative.dev/pkg/apis/duck