From 169a73aa1c977fa38e676a6eda7e4804d02c2f9f Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Tue, 16 Apr 2024 10:50:28 -0400 Subject: [PATCH] upgrade to latest dependencies (#477) bumping knative.dev/eventing-redis 122704e...7aba9d6: > 7aba9d6 upgrade to latest dependencies (# 559) bumping knative.dev/eventing d96c6db...f9d8dea: > f9d8dea [main] Upgrade to latest dependencies (# 7842) bumping knative.dev/pkg 39d72da...2a68697: > 2a68697 Bump google.golang.org/grpc from 1.63.0 to 1.63.2 (# 3017) > 2cca32d Revert "drop eventing-rabbitmq downstream testing (# 2969)" (# 3008) 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/reconciler-test 3991c6e...750cfce: > 750cfce upgrade to latest dependencies (# 704) Signed-off-by: Knative Automation --- go.mod | 10 ++++----- go.sum | 20 +++++++++--------- vendor/google.golang.org/grpc/clientconn.go | 6 +----- .../grpc/internal/channelz/funcs.go | 21 ++++++++++--------- vendor/google.golang.org/grpc/version.go | 2 +- vendor/modules.txt | 10 ++++----- 6 files changed, 33 insertions(+), 36 deletions(-) diff --git a/go.mod b/go.mod index c7f10252..d10971de 100644 --- a/go.mod +++ b/go.mod @@ -11,12 +11,12 @@ require ( k8s.io/apimachinery v0.29.2 k8s.io/client-go v0.29.2 k8s.io/code-generator v0.29.2 - knative.dev/eventing v0.40.1-0.20240412211715-d96c6db35034 + knative.dev/eventing v0.40.1-0.20240415144124-f9d8dea7953b knative.dev/eventing-kafka v0.40.1-0.20240207142533-d23eb248d3ac - knative.dev/eventing-redis v0.40.1-0.20240412061119-122704e1b436 + knative.dev/eventing-redis v0.40.1-0.20240415134240-7aba9d635f6b knative.dev/hack v0.0.0-20240404013450-1133b37da8d7 - knative.dev/pkg v0.0.0-20240415083725-39d72dabe4f2 - knative.dev/reconciler-test v0.0.0-20240410132651-3991c6ef9162 + knative.dev/pkg v0.0.0-20240416131957-2a686972868e + knative.dev/reconciler-test v0.0.0-20240415134357-750cfceb94ab sigs.k8s.io/controller-runtime v0.13.1 ) @@ -90,7 +90,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 google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 9c6c35bc..258fbdd5 100644 --- a/go.sum +++ b/go.sum @@ -703,8 +703,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= @@ -772,18 +772,18 @@ 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.20240412211715-d96c6db35034 h1:4nyq7I4CyAETiS30+GvLCcnhrttOJdXobUnN8fR2v+M= -knative.dev/eventing v0.40.1-0.20240412211715-d96c6db35034/go.mod h1:9Z4LOibonSIPvnb3KNoYKNsEHX2I3i97n3s+mvNeOh0= +knative.dev/eventing v0.40.1-0.20240415144124-f9d8dea7953b h1:w5+lI5uEya5vsMxZGgmmffR59TzduNNRso+aXyGKzfE= +knative.dev/eventing v0.40.1-0.20240415144124-f9d8dea7953b/go.mod h1:udh91In1azSDfSYAQafZjEA1oTGcjIsdx8Zu1Aj4Qew= knative.dev/eventing-kafka v0.40.1-0.20240207142533-d23eb248d3ac h1:ZchQuCUvW4Hgn/6I+SRuaPei5JDtUqQ1he44tJ728hA= knative.dev/eventing-kafka v0.40.1-0.20240207142533-d23eb248d3ac/go.mod h1:qGgNS+zY1A3xKqJFZ3KIWeWKZHIewBS1XmpRvTNQRJA= -knative.dev/eventing-redis v0.40.1-0.20240412061119-122704e1b436 h1:qvdrLEjTgE5o9lqVmot+7vKr1yiEGtz2T/N4gcPV8RU= -knative.dev/eventing-redis v0.40.1-0.20240412061119-122704e1b436/go.mod h1:EpXbzNJ5bLHHeKAloa5B4pJOZjoqQpHmse13wc+7sdE= +knative.dev/eventing-redis v0.40.1-0.20240415134240-7aba9d635f6b h1:GzwAZj8Ha93FqRVpAputXK8z2d4aG4WmxQr5HGyN4+Y= +knative.dev/eventing-redis v0.40.1-0.20240415134240-7aba9d635f6b/go.mod h1:6BXPZtp6P9YRIvaiQp5PIhyQpCsFLsvwrCPw39X8uRo= 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/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/reconciler-test v0.0.0-20240410132651-3991c6ef9162 h1:8j9nl3wa8Pd6E8uMgcgGAkmVjI3f6M4fGM8sFDZOaaw= -knative.dev/reconciler-test v0.0.0-20240410132651-3991c6ef9162/go.mod h1:0pt2EF5aPFtCtepdifk6CHNhlox9quLj+VUv5+9jtOc= +knative.dev/pkg v0.0.0-20240416131957-2a686972868e h1:MoZmC4nDXKqxRM414CCPjnDPiRzDWlA4GHdWkKs47sI= +knative.dev/pkg v0.0.0-20240416131957-2a686972868e/go.mod h1:s0Pq84a5h8vNjvSAiwsSz0tU0T9ngtuwFzVGaOXBQ3A= +knative.dev/reconciler-test v0.0.0-20240415134357-750cfceb94ab h1:3L+pu0okWM4yhS7KKDsoVWnvmw63bH65MeZnZ+9crhU= +knative.dev/reconciler-test v0.0.0-20240415134357-750cfceb94ab/go.mod h1:HokYxcNiu1cZAi/bz8PTBiK1SHRLYhEBQDPH9Bpb4C0= 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 e3eb44d5..c7f26071 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 f461e9bc..03e24e15 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 eaf5dbce..2556f758 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/modules.txt b/vendor/modules.txt index c7eb772f..3876bf94 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -333,7 +333,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 @@ -900,7 +900,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.20240412211715-d96c6db35034 +# knative.dev/eventing v0.40.1-0.20240415144124-f9d8dea7953b ## explicit; go 1.21 knative.dev/eventing/pkg/apis/config knative.dev/eventing/pkg/apis/duck @@ -975,14 +975,14 @@ knative.dev/eventing-kafka/test/rekt/features/kafkasource knative.dev/eventing-kafka/test/rekt/resources/kafkacat knative.dev/eventing-kafka/test/rekt/resources/kafkasource knative.dev/eventing-kafka/test/rekt/resources/kafkatopic -# knative.dev/eventing-redis v0.40.1-0.20240412061119-122704e1b436 +# knative.dev/eventing-redis v0.40.1-0.20240415134240-7aba9d635f6b ## explicit; go 1.21 knative.dev/eventing-redis/pkg/source/apis/sources knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1 # knative.dev/hack v0.0.0-20240404013450-1133b37da8d7 ## explicit; go 1.18 knative.dev/hack -# knative.dev/pkg v0.0.0-20240415083725-39d72dabe4f2 +# knative.dev/pkg v0.0.0-20240416131957-2a686972868e ## explicit; go 1.21 knative.dev/pkg/apis knative.dev/pkg/apis/duck @@ -1052,7 +1052,7 @@ knative.dev/pkg/webhook/json knative.dev/pkg/webhook/resourcesemantics knative.dev/pkg/webhook/resourcesemantics/defaulting knative.dev/pkg/webhook/resourcesemantics/validation -# knative.dev/reconciler-test v0.0.0-20240410132651-3991c6ef9162 +# knative.dev/reconciler-test v0.0.0-20240415134357-750cfceb94ab ## explicit; go 1.21 knative.dev/reconciler-test/cmd/eventshub knative.dev/reconciler-test/pkg/environment