Skip to content

Commit 554ff21

Browse files
knative-automationknative-automation
committed
upgrade to latest dependencies
bumping knative.dev/reconciler-test f46fa65...9a20896: > 9a20896 upgrade to latest dependencies (# 797) bumping knative.dev/eventing 40bac3c...da948cb: > da948cb Return assigned port for HTTPEventReceiver (# 8596) > 3edf526 [main] Upgrade to latest dependencies (# 8595) bumping knative.dev/pkg 44579e9...3c3a920: > 3c3a920 Bump google.golang.org/grpc from 1.72.1 to 1.72.2 (# 3181) bumping google.golang.org/grpc 4cf3cf7...6135a73: > 6135a73 Change version to v1.72.2 (# 8357) > eef8c9c delegatingresolver: avoid proxy for resolved addresses in NO_PROXY env (# 8329) (# 8353) > 3b5fa74 balancer/least_request : Fix panic while handling resolver errors (# 8333) (# 8339) > edf643f Change version to v1.72.2-dev (# 8326) Signed-off-by: Knative Automation <automation@knative.team>
1 parent ace3931 commit 554ff21

File tree

7 files changed

+81
-42
lines changed

7 files changed

+81
-42
lines changed

‎go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ require (
2020
k8s.io/client-go v0.32.2
2121
k8s.io/code-generator v0.32.2
2222
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7
23-
knative.dev/eventing v0.45.1-0.20250526160117-40bac3cce0e6
23+
knative.dev/eventing v0.45.1-0.20250603123125-da948cba5099
2424
knative.dev/hack v0.0.0-20250514121446-f525e187efdc
25-
knative.dev/pkg v0.0.0-20250520014526-44579e9ce5ed
26-
knative.dev/reconciler-test v0.0.0-20250516121650-f46fa6544a97
25+
knative.dev/pkg v0.0.0-20250602175424-3c3a920206ea
26+
knative.dev/reconciler-test v0.0.0-20250602074324-9a20896ca854
2727
sigs.k8s.io/controller-runtime v0.19.0
2828
)
2929

@@ -108,7 +108,7 @@ require (
108108
google.golang.org/api v0.198.0 // indirect
109109
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
110110
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
111-
google.golang.org/grpc v1.72.1 // indirect
111+
google.golang.org/grpc v1.72.2 // indirect
112112
google.golang.org/protobuf v1.36.6 // indirect
113113
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
114114
gopkg.in/inf.v0 v0.9.1 // indirect

‎go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,8 +1046,8 @@ google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD
10461046
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
10471047
google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
10481048
google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
1049-
google.golang.org/grpc v1.72.1 h1:HR03wO6eyZ7lknl75XlxABNVLLFc2PAb6mHlYh756mA=
1050-
google.golang.org/grpc v1.72.1/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
1049+
google.golang.org/grpc v1.72.2 h1:TdbGzwb82ty4OusHWepvFWGLgIbNo1/SUynEN0ssqv8=
1050+
google.golang.org/grpc v1.72.2/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
10511051
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
10521052
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
10531053
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -1120,14 +1120,14 @@ k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 h1:hcha5B1kVACrLujCKLbr8X
11201120
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7/go.mod h1:GewRfANuJ70iYzvn+i4lezLDAFzvjxZYK1gn1lWcfas=
11211121
k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
11221122
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
1123-
knative.dev/eventing v0.45.1-0.20250526160117-40bac3cce0e6 h1:fniykATajL1VvDiZQfpgWg1wR000KIYJCL7oEpxIvJU=
1124-
knative.dev/eventing v0.45.1-0.20250526160117-40bac3cce0e6/go.mod h1:WeMsyA/c2/QEYAxSQrtCDr2tDegvkVxHlqlSuC9GS9k=
1123+
knative.dev/eventing v0.45.1-0.20250603123125-da948cba5099 h1:/YPJyTvzKjDNvc4upX+JsFXRb0tGwTWFca+/o+lRk3E=
1124+
knative.dev/eventing v0.45.1-0.20250603123125-da948cba5099/go.mod h1:EsMEGF9zAiS2mJ2P2r1HCTWQ+Zv96ytiSqttIMeqNj0=
11251125
knative.dev/hack v0.0.0-20250514121446-f525e187efdc h1:8HmclJlA0zNE/G1SkgdC3/IFSSyhaSz2iIhihU6YbEo=
11261126
knative.dev/hack v0.0.0-20250514121446-f525e187efdc/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
1127-
knative.dev/pkg v0.0.0-20250520014526-44579e9ce5ed h1:5ZYbJDnkQ/Q3oZsiwD0hnbmMwC6+2KvkIJNPH9IToUE=
1128-
knative.dev/pkg v0.0.0-20250520014526-44579e9ce5ed/go.mod h1:RgnJAMaNr/5xVZ9Kkd2BBkeNt1/TpDOo5fCSTqaVX8w=
1129-
knative.dev/reconciler-test v0.0.0-20250516121650-f46fa6544a97 h1:IcAtORqZ3ek+HN9799LRRiBijSgNCdtAvF1S7qzPvcM=
1130-
knative.dev/reconciler-test v0.0.0-20250516121650-f46fa6544a97/go.mod h1:CWM3ApZHYFCw2gQi1SDSVSoMNaGMm3M4JZidda6PhY0=
1127+
knative.dev/pkg v0.0.0-20250602175424-3c3a920206ea h1:ukJPq9MzFTEH/Sei5MSVnSE8+7NSCKixCDZPd6p4ohw=
1128+
knative.dev/pkg v0.0.0-20250602175424-3c3a920206ea/go.mod h1:tFayQbi6t4+5HXuEGLOGvILW228Q7uaJp/FYEgbjJ3A=
1129+
knative.dev/reconciler-test v0.0.0-20250602074324-9a20896ca854 h1:lVLYcQMWGDzcY2jKJI4NwbCReADA/k9f3RQUBBxx/cc=
1130+
knative.dev/reconciler-test v0.0.0-20250602074324-9a20896ca854/go.mod h1:r6tSGY5T+AXRITlgAbyg2wM2LfCn/DgXX7tw24ku58k=
11311131
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
11321132
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
11331133
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

‎vendor/google.golang.org/grpc/internal/resolver/delegatingresolver/delegatingresolver.go

Lines changed: 32 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/google.golang.org/grpc/version.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/knative.dev/eventing/pkg/eventingtls/eventingtlstesting/eventingtlstesting.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func init() {
4747
CA, Key, Crt = loadCerts()
4848
}
4949

50-
func StartServer(ctx context.Context, t *testing.T, port int, handler http.Handler, receiverOptions ...kncloudevents.HTTPEventReceiverOption) string {
50+
func StartServer(ctx context.Context, t *testing.T, port int, handler http.Handler, receiverOptions ...kncloudevents.HTTPEventReceiverOption) (string, int) {
5151
secret := types.NamespacedName{
5252
Namespace: "knative-tests",
5353
Name: "tls-secret",
@@ -83,7 +83,7 @@ func StartServer(ctx context.Context, t *testing.T, port int, handler http.Handl
8383
}
8484
}()
8585

86-
return string(CA)
86+
return string(CA), receiver.GetPort()
8787
}
8888

8989
func loadCerts() ([]byte, []byte, []byte) {

‎vendor/knative.dev/eventing/pkg/kncloudevents/event_receiver.go

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"fmt"
2323
"net"
2424
"net/http"
25+
"strconv"
2526
"time"
2627

2728
"go.opencensus.io/plugin/ochttp"
@@ -34,7 +35,8 @@ const (
3435
)
3536

3637
type HTTPEventReceiver struct {
37-
port int
38+
desiredPort int
39+
port int
3840

3941
server *http.Server
4042
listener net.Listener
@@ -49,13 +51,14 @@ type HTTPEventReceiver struct {
4951
// HTTPEventReceiverOption enables further configuration of a HTTPEventReceiver.
5052
type HTTPEventReceiverOption func(*HTTPEventReceiver)
5153

52-
func NewHTTPEventReceiver(port int, o ...HTTPEventReceiverOption) *HTTPEventReceiver {
54+
// NewHTTPEventReceiver creates a new HTTPEventReceiver. When desiredPort is set to 0, a free port will be chosen.
55+
// The final port of the running server will be stored in receiver.Port.
56+
func NewHTTPEventReceiver(desiredPort int, o ...HTTPEventReceiverOption) *HTTPEventReceiver {
5357
h := &HTTPEventReceiver{
54-
port: port,
58+
desiredPort: desiredPort,
59+
Ready: make(chan interface{}),
5560
}
5661

57-
h.Ready = make(chan interface{})
58-
5962
for _, opt := range o {
6063
opt(h)
6164
}
@@ -122,10 +125,19 @@ func (recv *HTTPEventReceiver) GetAddr() string {
122125
return ""
123126
}
124127

128+
// GetPort returns the final assigned port of the server.
129+
// This is blocking, as we need to wait until the server is running.
130+
func (recv *HTTPEventReceiver) GetPort() int {
131+
// wait until server is ready, as only then the port is assigned
132+
<-recv.Ready
133+
134+
return recv.port
135+
}
136+
125137
// Blocking
126138
func (recv *HTTPEventReceiver) StartListen(ctx context.Context, handler http.Handler) error {
127139
var err error
128-
if recv.listener, err = net.Listen("tcp", fmt.Sprintf(":%d", recv.port)); err != nil {
140+
if recv.listener, err = net.Listen("tcp", fmt.Sprintf(":%d", recv.desiredPort)); err != nil {
129141
return err
130142
}
131143

@@ -140,6 +152,18 @@ func (recv *HTTPEventReceiver) StartListen(ctx context.Context, handler http.Han
140152
recv.server.Addr = recv.listener.Addr().String()
141153
recv.server.Handler = drainer
142154

155+
_, portStr, err := net.SplitHostPort(recv.server.Addr)
156+
if err != nil {
157+
return fmt.Errorf("could not get port of server: %w", err)
158+
}
159+
160+
port, err := strconv.Atoi(portStr)
161+
if err != nil {
162+
return fmt.Errorf("could not convert port to int: %w", err)
163+
}
164+
165+
recv.port = port
166+
143167
errChan := make(chan error, 1)
144168
go func() {
145169
close(recv.Ready)

‎vendor/modules.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ google.golang.org/genproto/googleapis/api/httpbody
445445
# google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a
446446
## explicit; go 1.22
447447
google.golang.org/genproto/googleapis/rpc/status
448-
# google.golang.org/grpc v1.72.1
448+
# google.golang.org/grpc v1.72.2
449449
## explicit; go 1.23
450450
google.golang.org/grpc
451451
google.golang.org/grpc/attributes
@@ -1114,7 +1114,7 @@ k8s.io/utils/net
11141114
k8s.io/utils/pointer
11151115
k8s.io/utils/ptr
11161116
k8s.io/utils/trace
1117-
# knative.dev/eventing v0.45.1-0.20250526160117-40bac3cce0e6
1117+
# knative.dev/eventing v0.45.1-0.20250603123125-da948cba5099
11181118
## explicit; go 1.23.0
11191119
knative.dev/eventing/cmd/heartbeats
11201120
knative.dev/eventing/pkg/adapter/v2
@@ -1253,7 +1253,7 @@ knative.dev/eventing/test/test_images/print
12531253
# knative.dev/hack v0.0.0-20250514121446-f525e187efdc
12541254
## explicit; go 1.21
12551255
knative.dev/hack
1256-
# knative.dev/pkg v0.0.0-20250520014526-44579e9ce5ed
1256+
# knative.dev/pkg v0.0.0-20250602175424-3c3a920206ea
12571257
## explicit; go 1.23.0
12581258
knative.dev/pkg/apis
12591259
knative.dev/pkg/apis/duck
@@ -1359,7 +1359,7 @@ knative.dev/pkg/webhook/json
13591359
knative.dev/pkg/webhook/resourcesemantics
13601360
knative.dev/pkg/webhook/resourcesemantics/defaulting
13611361
knative.dev/pkg/webhook/resourcesemantics/validation
1362-
# knative.dev/reconciler-test v0.0.0-20250516121650-f46fa6544a97
1362+
# knative.dev/reconciler-test v0.0.0-20250602074324-9a20896ca854
13631363
## explicit; go 1.23.0
13641364
knative.dev/reconciler-test/cmd/eventshub
13651365
knative.dev/reconciler-test/pkg/environment

0 commit comments

Comments
 (0)