From 79d07cbedc08279125a771d779ed7c7061ca7580 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Wed, 3 Apr 2024 02:10:00 -0400 Subject: [PATCH] upgrade to latest dependencies (#1300) 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 | 2 +- go.sum | 4 ++-- .../knative.dev/pkg/injection/sharedmain/main.go | 2 +- .../knative.dev/pkg/reconciler/testing/context.go | 2 +- vendor/knative.dev/pkg/test/kube_checks.go | 14 +++++++------- vendor/knative.dev/pkg/test/spoof/spoof.go | 2 +- vendor/modules.txt | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index ab989e5c38..5afc7abb7a 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( k8s.io/client-go v0.29.2 knative.dev/hack v0.0.0-20240327150553-47368d631660 knative.dev/networking v0.0.0-20240329112016-75762caf9e15 - knative.dev/pkg v0.0.0-20240401190221-03bf3de6e2bc + knative.dev/pkg v0.0.0-20240402144403-fef5da99bd14 sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index c3beb6a580..60120f705c 100644 --- a/go.sum +++ b/go.sum @@ -698,8 +698,8 @@ knative.dev/hack v0.0.0-20240327150553-47368d631660 h1:tW6NgyjMnSXBS75+k+Xh5uNiL knative.dev/hack v0.0.0-20240327150553-47368d631660/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= 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-20240401190221-03bf3de6e2bc h1:qgjjXNqWPaIfxO00DbbB+SaeaKiwvMTIB3BcBtuzoqc= -knative.dev/pkg v0.0.0-20240401190221-03bf3de6e2bc/go.mod h1:086p4jjTy1KCaL2uoznjgh+kKVp0Vk2hh4yagpbUhOA= +knative.dev/pkg v0.0.0-20240402144403-fef5da99bd14 h1:WQEFu4M1CGsz1TQNHO6N34asNTInsEw26nqw5p1lxhE= +knative.dev/pkg v0.0.0-20240402144403-fef5da99bd14/go.mod h1:086p4jjTy1KCaL2uoznjgh+kKVp0Vk2hh4yagpbUhOA= 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 79c42c2014..348599f096 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 a1ea75903c..58b3b8d29a 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/knative.dev/pkg/test/kube_checks.go b/vendor/knative.dev/pkg/test/kube_checks.go index 3e295a55f3..3b2b7101a0 100644 --- a/vendor/knative.dev/pkg/test/kube_checks.go +++ b/vendor/knative.dev/pkg/test/kube_checks.go @@ -53,7 +53,7 @@ func WaitForDeploymentState(ctx context.Context, client kubernetes.Interface, na span := logging.GetEmitableSpan(ctx, fmt.Sprintf("WaitForDeploymentState/%s/%s", name, desc)) defer span.End() var lastState *appsv1.Deployment - waitErr := wait.PollImmediate(interval, timeout, func() (bool, error) { + waitErr := wait.PollUntilContextTimeout(ctx, interval, timeout, true, func(ctx context.Context) (bool, error) { var err error lastState, err = d.Get(ctx, name, metav1.GetOptions{}) if err != nil { @@ -78,7 +78,7 @@ func WaitForPodListState(ctx context.Context, client kubernetes.Interface, inSta defer span.End() var lastState *corev1.PodList - waitErr := wait.PollImmediate(interval, podTimeout, func() (bool, error) { + waitErr := wait.PollUntilContextTimeout(ctx, interval, podTimeout, true, func(ctx context.Context) (bool, error) { var err error lastState, err = p.List(ctx, metav1.ListOptions{}) if err != nil { @@ -103,7 +103,7 @@ func WaitForPodState(ctx context.Context, client kubernetes.Interface, inState f defer span.End() var lastState *corev1.Pod - waitErr := wait.PollImmediate(interval, podTimeout, func() (bool, error) { + waitErr := wait.PollUntilContextTimeout(ctx, interval, podTimeout, true, func(ctx context.Context) (bool, error) { var err error lastState, err = p.Get(ctx, name, metav1.GetOptions{}) if err != nil { @@ -139,7 +139,7 @@ func WaitForServiceEndpoints(ctx context.Context, client kubernetes.Interface, s defer span.End() var endpoints *corev1.Endpoints - waitErr := wait.PollImmediate(interval, podTimeout, func() (bool, error) { + waitErr := wait.PollUntilContextTimeout(ctx, interval, podTimeout, true, func(ctx context.Context) (bool, error) { var err error endpoints, err = endpointsService.Get(ctx, svcName, metav1.GetOptions{}) if apierrs.IsNotFound(err) { @@ -186,7 +186,7 @@ func GetEndpointAddresses(ctx context.Context, client kubernetes.Interface, svcN // WaitForChangedEndpoints waits until the endpoints for the given service differ from origEndpoints. func WaitForChangedEndpoints(ctx context.Context, client kubernetes.Interface, svcName, svcNamespace string, origEndpoints []string) error { var newEndpoints []string - waitErr := wait.PollImmediate(1*time.Second, 2*time.Minute, func() (bool, error) { + waitErr := wait.PollUntilContextTimeout(ctx, 1*time.Second, 2*time.Minute, true, func(ctx context.Context) (bool, error) { var err error newEndpoints, err = GetEndpointAddresses(ctx, client, svcName, svcNamespace) return !cmp.Equal(origEndpoints, newEndpoints), err @@ -213,7 +213,7 @@ func DeploymentScaledToZeroFunc() func(d *appsv1.Deployment) (bool, error) { // If the content is not present within timeout it returns error. func WaitForLogContent(ctx context.Context, client kubernetes.Interface, podName, containerName, namespace, content string) error { var logs []byte - waitErr := wait.PollImmediate(interval, logTimeout, func() (bool, error) { + waitErr := wait.PollUntilContextTimeout(ctx, interval, logTimeout, true, func(ctx context.Context) (bool, error) { var err error logs, err = PodLogs(ctx, client, podName, containerName, namespace) if err != nil { @@ -236,7 +236,7 @@ func WaitForAllPodsRunning(ctx context.Context, client kubernetes.Interface, nam func WaitForPodRunning(ctx context.Context, client kubernetes.Interface, name string, namespace string) error { var p *corev1.Pod pods := client.CoreV1().Pods(namespace) - waitErr := wait.PollImmediate(interval, podTimeout, func() (bool, error) { + waitErr := wait.PollUntilContextTimeout(ctx, interval, podTimeout, true, func(ctx context.Context) (bool, error) { var err error p, err = pods.Get(ctx, name, metav1.GetOptions{}) if err != nil { diff --git a/vendor/knative.dev/pkg/test/spoof/spoof.go b/vendor/knative.dev/pkg/test/spoof/spoof.go index 319e2ead86..716e5d83db 100644 --- a/vendor/knative.dev/pkg/test/spoof/spoof.go +++ b/vendor/knative.dev/pkg/test/spoof/spoof.go @@ -167,7 +167,7 @@ func (sc *SpoofingClient) Poll(req *http.Request, inState ResponseChecker, check } var resp *Response - err := wait.PollImmediate(sc.RequestInterval, sc.RequestTimeout, func() (bool, error) { + err := wait.PollUntilContextTimeout(context.Background(), sc.RequestInterval, sc.RequestTimeout, true, func(ctx context.Context) (bool, error) { // Starting span to capture zipkin trace. traceContext, span := trace.StartSpan(req.Context(), "SpoofingClient-Trace") defer span.End() diff --git a/vendor/modules.txt b/vendor/modules.txt index dfe7c01e26..9a7ae7fa62 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -969,7 +969,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-20240401190221-03bf3de6e2bc +# knative.dev/pkg v0.0.0-20240402144403-fef5da99bd14 ## explicit; go 1.21 knative.dev/pkg/apis knative.dev/pkg/apis/duck