From a3c979cc316c24aefc11916906d0313b958cd490 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Thu, 18 Apr 2024 03:22:30 -0400 Subject: [PATCH] upgrade to latest dependencies (#1308) bumping knative.dev/networking 1d9a7cf...a40d058: > a40d058 upgrade to latest dependencies (# 968) > 594a2f8 identify each request in update test using a query timestamp (# 967) bumping google.golang.org/grpc c68f456...d32e66c: > d32e66c Change version to 1.63.2 (# 7104) > 92f6dd0 channelz: pass parent pointer instead of parent ID to RegisterSubChannel (# 7101) > 0f6ef0f grpc: un-deprecate Dial and DialContext > 58dc749 Change version to 1.63.1-dev (# 7051) bumping knative.dev/pkg 39d72da...0f34a88: > 0f34a88 upgrade to latest dependencies (# 3018) > 2a68697 Bump google.golang.org/grpc from 1.63.0 to 1.63.2 (# 3017) > 2cca32d Revert "drop eventing-rabbitmq downstream testing (# 2969)" (# 3008) Signed-off-by: Knative Automation --- go.mod | 6 +++--- go.sum | 12 +++++------ vendor/google.golang.org/grpc/clientconn.go | 6 +----- .../grpc/internal/channelz/funcs.go | 21 ++++++++++--------- vendor/google.golang.org/grpc/version.go | 2 +- .../test/conformance/ingress/update.go | 11 +++++++--- vendor/modules.txt | 6 +++--- 7 files changed, 33 insertions(+), 31 deletions(-) diff --git a/go.mod b/go.mod index 1f66391aa4..6f0970b9f5 100644 --- a/go.mod +++ b/go.mod @@ -13,8 +13,8 @@ require ( k8s.io/apimachinery v0.29.2 k8s.io/client-go v0.29.2 knative.dev/hack v0.0.0-20240404013450-1133b37da8d7 - knative.dev/networking v0.0.0-20240415144706-1d9a7cfb2ee1 - knative.dev/pkg v0.0.0-20240415083725-39d72dabe4f2 + knative.dev/networking v0.0.0-20240416165409-a40d058f6aef + knative.dev/pkg v0.0.0-20240416145024-0f34a8815650 sigs.k8s.io/yaml v1.4.0 ) @@ -79,7 +79,7 @@ require ( google.golang.org/api v0.172.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240314234333-6e1732d8331c // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect - google.golang.org/grpc v1.63.0 // indirect + google.golang.org/grpc v1.63.2 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 9ade087f59..0216ac4a9f 100644 --- a/go.sum +++ b/go.sum @@ -614,8 +614,8 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.63.0 h1:WjKe+dnvABXyPJMD7KDNLxtoGk5tgk+YFWN6cBWjZE8= -google.golang.org/grpc v1.63.0/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= +google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= +google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -685,10 +685,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-20240404013450-1133b37da8d7 h1:fkWYWvdHm1mVHevKW2vVJnZtxH0NzOlux8imesweKwE= knative.dev/hack v0.0.0-20240404013450-1133b37da8d7/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= -knative.dev/networking v0.0.0-20240415144706-1d9a7cfb2ee1 h1:fBcNiPhDp3IkKGEJk/rR1Tl/9mpHQnDuMSLOslJEPjQ= -knative.dev/networking v0.0.0-20240415144706-1d9a7cfb2ee1/go.mod h1:CuKjZ/QxZCV3p0Dsxjbi/6xygGZZ3CBvBHzFDLj9cHY= -knative.dev/pkg v0.0.0-20240415083725-39d72dabe4f2 h1:KJWHJSt3nw/ZOdsobHzZ0Q22F1epDFkn32ufec40NCs= -knative.dev/pkg v0.0.0-20240415083725-39d72dabe4f2/go.mod h1:zFm9ELu1AdcRb/OD7sXG+DlLJpKvsklW8WCWGBFBJ9k= +knative.dev/networking v0.0.0-20240416165409-a40d058f6aef h1:bA7FC8IGcXFO95LqbUqVMngp0bEXgQ/D2vXDJj8QbfI= +knative.dev/networking v0.0.0-20240416165409-a40d058f6aef/go.mod h1:bb3B1eNMNO827kErNDGKYYiBgtlaR6T1DEDnfEad3q4= +knative.dev/pkg v0.0.0-20240416145024-0f34a8815650 h1:m2ahFUO0L2VrgGDYdyOUFdE6xBd3pLXAJozLJwqLRQM= +knative.dev/pkg v0.0.0-20240416145024-0f34a8815650/go.mod h1:soFw5ss08G4PU3JiFDKqiZRd2U7xoqcfNpJP1coIXkY= 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/google.golang.org/grpc/clientconn.go b/vendor/google.golang.org/grpc/clientconn.go index e3eb44d58b..c7f2607114 100644 --- a/vendor/google.golang.org/grpc/clientconn.go +++ b/vendor/google.golang.org/grpc/clientconn.go @@ -196,8 +196,6 @@ func NewClient(target string, opts ...DialOption) (conn *ClientConn, err error) } // Dial calls DialContext(context.Background(), target, opts...). -// -// Deprecated: use NewClient instead. Will be supported throughout 1.x. func Dial(target string, opts ...DialOption) (*ClientConn, error) { return DialContext(context.Background(), target, opts...) } @@ -211,8 +209,6 @@ func Dial(target string, opts ...DialOption) (*ClientConn, error) { // "passthrough" for backward compatibility. This distinction should not matter // to most users, but could matter to legacy users that specify a custom dialer // and expect it to receive the target string directly. -// -// Deprecated: use NewClient instead. Will be supported throughout 1.x. func DialContext(ctx context.Context, target string, opts ...DialOption) (conn *ClientConn, err error) { // At the end of this method, we kick the channel out of idle, rather than // waiting for the first rpc. @@ -837,7 +833,7 @@ func (cc *ClientConn) newAddrConnLocked(addrs []resolver.Address, opts balancer. addrs: copyAddressesWithoutBalancerAttributes(addrs), scopts: opts, dopts: cc.dopts, - channelz: channelz.RegisterSubChannel(cc.channelz.ID, ""), + channelz: channelz.RegisterSubChannel(cc.channelz, ""), resetBackoff: make(chan struct{}), stateChan: make(chan struct{}), } diff --git a/vendor/google.golang.org/grpc/internal/channelz/funcs.go b/vendor/google.golang.org/grpc/internal/channelz/funcs.go index f461e9bc3b..03e24e1507 100644 --- a/vendor/google.golang.org/grpc/internal/channelz/funcs.go +++ b/vendor/google.golang.org/grpc/internal/channelz/funcs.go @@ -143,20 +143,21 @@ func RegisterChannel(parent *Channel, target string) *Channel { // Returns a unique channelz identifier assigned to this subChannel. // // If channelz is not turned ON, the channelz database is not mutated. -func RegisterSubChannel(pid int64, ref string) *SubChannel { +func RegisterSubChannel(parent *Channel, ref string) *SubChannel { id := IDGen.genID() - if !IsOn() { - return &SubChannel{ID: id} - } - sc := &SubChannel{ - RefName: ref, ID: id, - sockets: make(map[int64]string), - parent: db.getChannel(pid), - trace: &ChannelTrace{CreationTime: time.Now(), Events: make([]*traceEvent, 0, getMaxTraceEntry())}, + RefName: ref, + parent: parent, } - db.addSubChannel(id, sc, pid) + + if !IsOn() { + return sc + } + + sc.sockets = make(map[int64]string) + sc.trace = &ChannelTrace{CreationTime: time.Now(), Events: make([]*traceEvent, 0, getMaxTraceEntry())} + db.addSubChannel(id, sc, parent.ID) return sc } diff --git a/vendor/google.golang.org/grpc/version.go b/vendor/google.golang.org/grpc/version.go index eaf5dbceac..2556f75838 100644 --- a/vendor/google.golang.org/grpc/version.go +++ b/vendor/google.golang.org/grpc/version.go @@ -19,4 +19,4 @@ package grpc // Version is the current grpc version. -const Version = "1.63.0" +const Version = "1.63.2" diff --git a/vendor/knative.dev/networking/test/conformance/ingress/update.go b/vendor/knative.dev/networking/test/conformance/ingress/update.go index 00a9b092b9..9fb2ac28fd 100644 --- a/vendor/knative.dev/networking/test/conformance/ingress/update.go +++ b/vendor/knative.dev/networking/test/conformance/ingress/update.go @@ -19,6 +19,7 @@ package ingress import ( "context" "net/http" + "strconv" "testing" "time" @@ -108,7 +109,7 @@ func TestUpdate(t *testing.T) { // Check that it serves the right message as soon as we get "Ready", // but before we stop probing. - ri := RuntimeRequest(ctx, t, client, "http://"+hostname+"."+test.NetworkingFlags.ServiceDomain) + ri := RuntimeRequest(ctx, t, client, "http://"+hostname+"."+test.NetworkingFlags.ServiceDomain+timeQuery()) if ri != nil { if got := ri.Request.Headers.Get(updateHeaderName); got != sentinel { t.Errorf("Header[%q] = %q, wanted %q", updateHeaderName, got, sentinel) @@ -151,7 +152,7 @@ func TestUpdate(t *testing.T) { // Check that it serves the right message as soon as we get "Ready", // but before we stop probing. - ri := RuntimeRequest(ctx, t, client, "http://"+hostname+"."+test.NetworkingFlags.ServiceDomain) + ri := RuntimeRequest(ctx, t, client, "http://"+hostname+"."+test.NetworkingFlags.ServiceDomain+timeQuery()) if ri != nil { if got := ri.Request.Headers.Get(updateHeaderName); got != sentinel { t.Errorf("Header[%q] = %q, wanted %q", updateHeaderName, got, sentinel) @@ -184,7 +185,7 @@ func checkOK(ctx context.Context, t *testing.T, url string, client *http.Client) } // Scope the defer below to avoid leaking until the test completes. func() { - ri := RuntimeRequest(ctx, t, client, url) + ri := RuntimeRequest(ctx, t, client, url+timeQuery()) if ri != nil { // Use the updateHeaderName as a debug marker to identify which version // (of programming) is responding. @@ -200,3 +201,7 @@ func checkOK(ctx context.Context, t *testing.T, url string, client *http.Client) <-doneCh } } + +func timeQuery() string { + return "?time=" + strconv.FormatInt(time.Now().UnixNano(), 10) +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 1fb9c35073..f284ca3bc9 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -287,7 +287,7 @@ google.golang.org/genproto/googleapis/api/httpbody # google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 ## explicit; go 1.19 google.golang.org/genproto/googleapis/rpc/status -# google.golang.org/grpc v1.63.0 +# google.golang.org/grpc v1.63.2 ## explicit; go 1.19 google.golang.org/grpc google.golang.org/grpc/attributes @@ -910,7 +910,7 @@ k8s.io/utils/trace # knative.dev/hack v0.0.0-20240404013450-1133b37da8d7 ## explicit; go 1.18 knative.dev/hack -# knative.dev/networking v0.0.0-20240415144706-1d9a7cfb2ee1 +# knative.dev/networking v0.0.0-20240416165409-a40d058f6aef ## explicit; go 1.21 knative.dev/networking/config knative.dev/networking/pkg @@ -961,7 +961,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-20240415083725-39d72dabe4f2 +# knative.dev/pkg v0.0.0-20240416145024-0f34a8815650 ## explicit; go 1.21 knative.dev/pkg/apis knative.dev/pkg/apis/duck