Skip to content

Commit

Permalink
upgrade to latest dependencies (knative#1705)
Browse files Browse the repository at this point in the history
bumping knative.dev/pkg 405f0c4...bc60487:
  > bc60487 Update community files (# 2956)
bumping knative.dev/hack d1067f2...6090613:
  > 6090613 Update community files (# 366)
bumping knative.dev/serving 06eac8e...5efa21e:
  > 5efa21e Update net-gateway-api nightly (# 14892)
  > dad0326 Update net-contour nightly (# 14884)
  > 4286c63 Update community files (# 14890)
bumping knative.dev/caching d00011f...e020b43:
  > e020b43 Update community files (# 833)
bumping knative.dev/eventing 7d350ea...eac7384:
  > eac7384 Wait for events with poll interval after finished event received (# 7668)
  > ba77c3d [main] Update community files (# 7672)

Signed-off-by: Knative Automation <[email protected]>
  • Loading branch information
knative-automation authored Feb 14, 2024
1 parent 8dedad4 commit a0b0548
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 32 deletions.
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ require (
k8s.io/client-go v0.28.5
k8s.io/code-generator v0.28.5
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
knative.dev/caching v0.0.0-20240213023632-d00011f81a48
knative.dev/eventing v0.40.1-0.20240213144541-7d350ea0c6be
knative.dev/hack v0.0.0-20240213013318-d1067f24a2d0
knative.dev/pkg v0.0.0-20240213013005-405f0c4a023d
knative.dev/serving v0.40.1-0.20240213162412-06eac8e4ee5c
knative.dev/caching v0.0.0-20240214014133-e020b43db714
knative.dev/eventing v0.40.1-0.20240214122620-eac7384a6411
knative.dev/hack v0.0.0-20240214013533-60906130333c
knative.dev/pkg v0.0.0-20240214012925-bc60487fab77
knative.dev/serving v0.40.1-0.20240214121039-5efa21ed9cde
sigs.k8s.io/yaml v1.4.0
)

Expand Down
20 changes: 10 additions & 10 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1356,18 +1356,18 @@ k8s.io/utils v0.0.0-20200912215256-4140de9c8800/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/caching v0.0.0-20240213023632-d00011f81a48 h1:y1Boj07A+g28oeqNbou/IXVoSKO1buPJrlgq06J4Mk4=
knative.dev/caching v0.0.0-20240213023632-d00011f81a48/go.mod h1:5rHuHlXhhhDmh56iM5xT7WAgVrCIxgy+Siqyn2Sh5tw=
knative.dev/eventing v0.40.1-0.20240213144541-7d350ea0c6be h1:rfW0WCwF+wAjZ4xnDpEpqzCZNEx1TDjbV5Bn8DqxWEw=
knative.dev/eventing v0.40.1-0.20240213144541-7d350ea0c6be/go.mod h1:P8wzbDpfUlEqpCVI4gBhaZOoDlGJuDPiK0cpMVy3DnY=
knative.dev/hack v0.0.0-20240213013318-d1067f24a2d0 h1:lwwFtteqfkjxUweWBnrwLZYqNk/HtL0gdQYFa9lnUgo=
knative.dev/hack v0.0.0-20240213013318-d1067f24a2d0/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/caching v0.0.0-20240214014133-e020b43db714 h1:G/0fNtA12VW3aPaCmBnta9aWkRgSqLW51DUYNacpEz4=
knative.dev/caching v0.0.0-20240214014133-e020b43db714/go.mod h1:5rHuHlXhhhDmh56iM5xT7WAgVrCIxgy+Siqyn2Sh5tw=
knative.dev/eventing v0.40.1-0.20240214122620-eac7384a6411 h1:W0x6VzUa+UHKCOTk52EmBAjTq6SGvM4MhhvS40ghiq4=
knative.dev/eventing v0.40.1-0.20240214122620-eac7384a6411/go.mod h1:P8wzbDpfUlEqpCVI4gBhaZOoDlGJuDPiK0cpMVy3DnY=
knative.dev/hack v0.0.0-20240214013533-60906130333c h1:lzAOke75/B1p9r0/50q8UR9O5VqjXSAnOgvkKfdcQcY=
knative.dev/hack v0.0.0-20240214013533-60906130333c/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/networking v0.0.0-20240201014834-66bdffa75840 h1:P7A2O9dmtI37/QNcv2TnaqbiHQKybsGTYvNkP6LBaag=
knative.dev/networking v0.0.0-20240201014834-66bdffa75840/go.mod h1:s0rxrxjcN3A/vxZTIf+NLS/qc6UPmdVtXHE6uiqKjmQ=
knative.dev/pkg v0.0.0-20240213013005-405f0c4a023d h1:AmlTpi0CWhE5Fkmtsncyx6SNPqArq4YuxwZgDuan5AI=
knative.dev/pkg v0.0.0-20240213013005-405f0c4a023d/go.mod h1:jmjP5/Vy9LamN82J3DfoJpVAw5JHpNxjUF0f/QCDX6E=
knative.dev/serving v0.40.1-0.20240213162412-06eac8e4ee5c h1:agtu2L/D4FlQr3pO5sHkX5XybxV61CMuLLBsRXLV16c=
knative.dev/serving v0.40.1-0.20240213162412-06eac8e4ee5c/go.mod h1:JIzq1HnCz046VLZ/7ZeO5IJtGbw2ZLopXirORuV3ue0=
knative.dev/pkg v0.0.0-20240214012925-bc60487fab77 h1:HQUS9cmkqUFFXEB49JQgqp39rwt7xxWH516iT5JLxiU=
knative.dev/pkg v0.0.0-20240214012925-bc60487fab77/go.mod h1:jmjP5/Vy9LamN82J3DfoJpVAw5JHpNxjUF0f/QCDX6E=
knative.dev/serving v0.40.1-0.20240214121039-5efa21ed9cde h1:18eM8u6YFv5IEp+pmAjLKYxKFDO0pkH2jXGK4HT8lQ8=
knative.dev/serving v0.40.1-0.20240214121039-5efa21ed9cde/go.mod h1:JIzq1HnCz046VLZ/7ZeO5IJtGbw2ZLopXirORuV3ue0=
nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw=
pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ func defaultValues() *Config {
Receiver: ReceiverConfig{
Port: port,
Teardown: ReceiverTeardownConfig{
Duration: 3 * time.Second,
Duration: 60 * time.Second,
Interval: 1 * time.Second,
},
Progress: ReceiverProgressConfig{
Duration: time.Second,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
// ReceiverTeardownConfig holds config receiver teardown
type ReceiverTeardownConfig struct {
Duration time.Duration
Interval time.Duration
}

// ReceiverProgressConfig holds config receiver progress reporting
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@
package event

import (
"context"
"fmt"
"sync"
"time"

"k8s.io/apimachinery/pkg/util/wait"
"knative.dev/eventing/test/upgrade/prober/wathola/config"
)

Expand Down Expand Up @@ -104,23 +106,26 @@ func (f *finishedStore) RegisterFinished(finished *Finished) {
f.eventsSent = finished.EventsSent
f.totalRequests = finished.TotalRequests
log.Infof("finish event received, expecting %d event ware propagated", finished.EventsSent)
d := config.Instance.Receiver.Teardown.Duration
log.Infof("waiting additional %v to be sure all events came", d)
time.Sleep(d)
receivedEvents := f.steps.Count()

if receivedEvents != finished.EventsSent &&
// If sending was interrupted, tolerate one more received
// event as there's no way to check if the last event is delivered or not.
!(finished.SendingInterrupted && receivedEvents == finished.EventsSent+1) {
timeout := config.Instance.Receiver.Teardown.Duration
interval := config.Instance.Receiver.Teardown.Interval

log.Infof("waiting additional %v to be sure all events came", timeout)

if err := wait.PollUntilContextTimeout(context.Background(), interval, timeout, true /*immediate*/, func(context.Context) (bool, error) {
return f.steps.Count() == finished.EventsSent ||
// If sending was interrupted, tolerate one more received
// event as there's no way to check if the last event is delivered or not.
(finished.SendingInterrupted && f.steps.Count() == finished.EventsSent+1), nil
}); err != nil {
f.errors.throwUnexpected("expecting to have %v unique events received, "+
"but received %v unique events", finished.EventsSent, receivedEvents)
"but received %v unique events", finished.EventsSent, f.steps.Count())
f.reportViolations(finished)
f.errors.state = Failed
} else {
log.Infof("properly received %d unique events", receivedEvents)
log.Infof("properly received %d unique events", f.steps.Count())
f.errors.state = Success
}

// check down time
for _, unavailablePeriod := range finished.UnavailablePeriods {
if unavailablePeriod.Period > config.Instance.Receiver.Errors.UnavailablePeriodToReport {
Expand Down
10 changes: 5 additions & 5 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1306,11 +1306,11 @@ k8s.io/utils/net
k8s.io/utils/pointer
k8s.io/utils/strings/slices
k8s.io/utils/trace
# knative.dev/caching v0.0.0-20240213023632-d00011f81a48
# knative.dev/caching v0.0.0-20240214014133-e020b43db714
## explicit; go 1.18
knative.dev/caching/pkg/apis/caching
knative.dev/caching/pkg/apis/caching/v1alpha1
# knative.dev/eventing v0.40.1-0.20240213144541-7d350ea0c6be
# knative.dev/eventing v0.40.1-0.20240214122620-eac7384a6411
## explicit; go 1.21
knative.dev/eventing/pkg/apis/config
knative.dev/eventing/pkg/apis/duck
Expand Down Expand Up @@ -1405,7 +1405,7 @@ knative.dev/eventing/test/upgrade/prober/wathola/fetcher
knative.dev/eventing/test/upgrade/prober/wathola/forwarder
knative.dev/eventing/test/upgrade/prober/wathola/receiver
knative.dev/eventing/test/upgrade/prober/wathola/sender
# knative.dev/hack v0.0.0-20240213013318-d1067f24a2d0
# knative.dev/hack v0.0.0-20240214013533-60906130333c
## explicit; go 1.18
knative.dev/hack
# knative.dev/networking v0.0.0-20240201014834-66bdffa75840
Expand All @@ -1425,7 +1425,7 @@ knative.dev/networking/pkg/http/proxy
knative.dev/networking/pkg/http/stats
knative.dev/networking/pkg/ingress
knative.dev/networking/pkg/k8s
# knative.dev/pkg v0.0.0-20240213013005-405f0c4a023d
# knative.dev/pkg v0.0.0-20240214012925-bc60487fab77
## explicit; go 1.18
knative.dev/pkg/apiextensions/storageversion
knative.dev/pkg/apiextensions/storageversion/cmd/migrate
Expand Down Expand Up @@ -1506,7 +1506,7 @@ knative.dev/pkg/webhook
knative.dev/pkg/webhook/certificates
knative.dev/pkg/webhook/certificates/resources
knative.dev/pkg/webhook/resourcesemantics/conversion
# knative.dev/serving v0.40.1-0.20240213162412-06eac8e4ee5c
# knative.dev/serving v0.40.1-0.20240214121039-5efa21ed9cde
## explicit; go 1.21
knative.dev/serving/pkg/apis/autoscaling
knative.dev/serving/pkg/apis/autoscaling/v1alpha1
Expand Down

0 comments on commit a0b0548

Please sign in to comment.