From dbe72de5c6cefcb430adb2bebbad32d7b4a50433 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Wed, 3 Apr 2024 05:22:41 -0400 Subject: [PATCH] upgrade to latest dependencies (#474) bumping knative.dev/eventing 7e1c082...4cec554: > 4cec554 [main] Upgrade to latest dependencies (# 7818) bumping knative.dev/serving c2d0af1...91ebbbc: > 91ebbbc Update net-istio nightly (# 15080) > 117a061 Update net-certmanager nightly (# 15079) > 949fb0b Update net-kourier nightly (# 15078) > 4a83412 Update net-gateway-api nightly (# 15077) > fd8e206 Update kapp/ytt/kail versions (# 15075) > ab4b65d upgrade to latest dependencies (# 15076) bumping knative.dev/networking e7cfc5b...75762ca: > 75762ca upgrade to latest dependencies (# 955) bumping knative.dev/pkg 03bf3de...fef5da9: > fef5da9 Replace all usages of deprecated wait.PollImmediate with wait.PollUntilContextTimeout (# 3004) Signed-off-by: Knative Automation --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- .../knative.dev/pkg/injection/sharedmain/main.go | 2 +- .../pkg/reconciler/testing/context.go | 2 +- vendor/modules.txt | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index b2158c7e4..a690e7114 100644 --- a/go.mod +++ b/go.mod @@ -15,10 +15,10 @@ require ( k8s.io/api v0.29.2 k8s.io/apimachinery v0.29.2 k8s.io/client-go v0.29.2 - knative.dev/eventing v0.40.1-0.20240328132724-7e1c08246ca3 + knative.dev/eventing v0.40.1-0.20240402102742-4cec55450957 knative.dev/hack v0.0.0-20240327150553-47368d631660 - knative.dev/pkg v0.0.0-20240401190221-03bf3de6e2bc - knative.dev/serving v0.40.1-0.20240401154359-c2d0af1e4cc1 + knative.dev/pkg v0.0.0-20240402144403-fef5da99bd14 + knative.dev/serving v0.40.1-0.20240402145124-91ebbbc3dd69 ) require ( @@ -100,7 +100,7 @@ require ( k8s.io/klog/v2 v2.120.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect - knative.dev/networking v0.0.0-20240328164909-e7cfc5b7276f // indirect + knative.dev/networking v0.0.0-20240329112016-75762caf9e15 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect sigs.k8s.io/yaml v1.4.0 // indirect diff --git a/go.sum b/go.sum index 9434f9bf1..e80865c80 100644 --- a/go.sum +++ b/go.sum @@ -719,16 +719,16 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ= k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -knative.dev/eventing v0.40.1-0.20240328132724-7e1c08246ca3 h1:+5XTIq9iJgk1Br0Ex5nEJBhy9wGMVaFY6HzW0/E0mrU= -knative.dev/eventing v0.40.1-0.20240328132724-7e1c08246ca3/go.mod h1:19sfPiy4dK2jBIHgszOTk43qOvfCXz1GTIncRY3trB8= +knative.dev/eventing v0.40.1-0.20240402102742-4cec55450957 h1:emsn7mCg3YiSiYWWGG96QBU3UxLYDsHFE/O0QpT3TjM= +knative.dev/eventing v0.40.1-0.20240402102742-4cec55450957/go.mod h1:uI9NfjmGJUXITlhdMus7K+LYZYxH85pf67HfJjyCMfs= knative.dev/hack v0.0.0-20240327150553-47368d631660 h1:tW6NgyjMnSXBS75+k+Xh5uNiLhJ9TFswS9hrkC3OQOc= knative.dev/hack v0.0.0-20240327150553-47368d631660/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= -knative.dev/networking v0.0.0-20240328164909-e7cfc5b7276f h1:zUKDqyqgooQdd+g9JWXtbQBXdYfHnqbyMoIaTmQ43eQ= -knative.dev/networking v0.0.0-20240328164909-e7cfc5b7276f/go.mod h1:uCy8+UXsCtZyb9fmQWrZm7byeZtyGj1fpHxHVKn+prg= -knative.dev/pkg v0.0.0-20240401190221-03bf3de6e2bc h1:qgjjXNqWPaIfxO00DbbB+SaeaKiwvMTIB3BcBtuzoqc= -knative.dev/pkg v0.0.0-20240401190221-03bf3de6e2bc/go.mod h1:086p4jjTy1KCaL2uoznjgh+kKVp0Vk2hh4yagpbUhOA= -knative.dev/serving v0.40.1-0.20240401154359-c2d0af1e4cc1 h1:B8yCh04QlM/n77Rra85Cs0qdl8itUM2O0ZDsT8TfAGs= -knative.dev/serving v0.40.1-0.20240401154359-c2d0af1e4cc1/go.mod h1:1ZxBVWDLDQ979N7ON85aSMXCH+582Hlg80uH/xtd9UA= +knative.dev/networking v0.0.0-20240329112016-75762caf9e15 h1:AXfadR7ULrSY10o8oaz2bEevGCg034rMb8c7Zdwc9Ac= +knative.dev/networking v0.0.0-20240329112016-75762caf9e15/go.mod h1:g/w0osd9bivSJjKwB0aL6KsjRBTQjk+bDFc9/qYUIQY= +knative.dev/pkg v0.0.0-20240402144403-fef5da99bd14 h1:WQEFu4M1CGsz1TQNHO6N34asNTInsEw26nqw5p1lxhE= +knative.dev/pkg v0.0.0-20240402144403-fef5da99bd14/go.mod h1:086p4jjTy1KCaL2uoznjgh+kKVp0Vk2hh4yagpbUhOA= +knative.dev/serving v0.40.1-0.20240402145124-91ebbbc3dd69 h1:Ssgl7hLHil9KSICbMM0y/CVSlU59O7CnLJJKdkezEvY= +knative.dev/serving v0.40.1-0.20240402145124-91ebbbc3dd69/go.mod h1:Nr+ffiiV3xQHlRUvqhmTv5Q9fQBTdTTVuBbludGjRo8= 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/injection/sharedmain/main.go b/vendor/knative.dev/pkg/injection/sharedmain/main.go index 79c42c201..348599f09 100644 --- a/vendor/knative.dev/pkg/injection/sharedmain/main.go +++ b/vendor/knative.dev/pkg/injection/sharedmain/main.go @@ -74,7 +74,7 @@ func GetLoggingConfig(ctx context.Context) (*logging.Config, error) { // These timeout and retry interval are set by heuristics. // e.g. istio sidecar needs a few seconds to configure the pod network. var lastErr error - if err := wait.PollImmediate(1*time.Second, 5*time.Second, func() (bool, error) { + if err := wait.PollUntilContextTimeout(ctx, 1*time.Second, 5*time.Second, true, func(ctx context.Context) (bool, error) { loggingConfigMap, lastErr = kubeclient.Get(ctx).CoreV1().ConfigMaps(system.Namespace()).Get(ctx, logging.ConfigMapName(), metav1.GetOptions{}) return lastErr == nil || apierrors.IsNotFound(lastErr), nil }); err != nil { diff --git a/vendor/knative.dev/pkg/reconciler/testing/context.go b/vendor/knative.dev/pkg/reconciler/testing/context.go index a1ea75903..58b3b8d29 100644 --- a/vendor/knative.dev/pkg/reconciler/testing/context.go +++ b/vendor/knative.dev/pkg/reconciler/testing/context.go @@ -120,7 +120,7 @@ func RunAndSyncInformers(ctx context.Context, informers ...controller.Informer) return wf, err } - err = wait.PollImmediate(time.Microsecond, wait.ForeverTestTimeout, func() (bool, error) { + err = wait.PollUntilContextTimeout(ctx, time.Microsecond, wait.ForeverTestTimeout, true, func(ctx context.Context) (bool, error) { if watchesPending.Load() == 0 { return true, nil } diff --git a/vendor/modules.txt b/vendor/modules.txt index c3dbfcd7d..ebf35b08d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -953,7 +953,7 @@ k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/eventing v0.40.1-0.20240328132724-7e1c08246ca3 +# knative.dev/eventing v0.40.1-0.20240402102742-4cec55450957 ## explicit; go 1.21 knative.dev/eventing/pkg/adapter/v2 knative.dev/eventing/pkg/adapter/v2/test @@ -970,12 +970,12 @@ knative.dev/eventing/pkg/reconciler/source # knative.dev/hack v0.0.0-20240327150553-47368d631660 ## explicit; go 1.18 knative.dev/hack -# knative.dev/networking v0.0.0-20240328164909-e7cfc5b7276f +# knative.dev/networking v0.0.0-20240329112016-75762caf9e15 ## explicit; go 1.21 knative.dev/networking/pkg/apis/networking knative.dev/networking/pkg/apis/networking/v1alpha1 knative.dev/networking/pkg/config -# knative.dev/pkg v0.0.0-20240401190221-03bf3de6e2bc +# knative.dev/pkg v0.0.0-20240402144403-fef5da99bd14 ## explicit; go 1.21 knative.dev/pkg/apis knative.dev/pkg/apis/duck @@ -1038,7 +1038,7 @@ knative.dev/pkg/webhook/psbinding knative.dev/pkg/webhook/resourcesemantics knative.dev/pkg/webhook/resourcesemantics/defaulting knative.dev/pkg/webhook/resourcesemantics/validation -# knative.dev/serving v0.40.1-0.20240401154359-c2d0af1e4cc1 +# knative.dev/serving v0.40.1-0.20240402145124-91ebbbc3dd69 ## explicit; go 1.21 knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1