diff --git a/go.mod b/go.mod index 287f530c2..4f7007741 100644 --- a/go.mod +++ b/go.mod @@ -12,10 +12,10 @@ require ( k8s.io/api v0.33.4 k8s.io/apimachinery v0.33.4 k8s.io/client-go v0.33.4 - knative.dev/client/pkg v0.0.0-20250901022440-5d83f5ca1c77 - knative.dev/eventing-kafka-broker v0.46.1-0.20250902055842-bd49e7709170 + knative.dev/client/pkg v0.0.0-20250908140348-a01fc2fb038c + knative.dev/eventing-kafka-broker v0.46.1-0.20250908122347-20212a58b91a knative.dev/hack v0.0.0-20250902153942-1499de21e119 - knative.dev/pkg v0.0.0-20250903014743-528bde37b646 + knative.dev/pkg v0.0.0-20250909010931-8c9c1d368e4b ) require ( @@ -88,13 +88,13 @@ require ( go.yaml.in/yaml/v2 v2.4.2 // indirect golang.org/x/net v0.43.0 // indirect golang.org/x/oauth2 v0.30.0 // indirect - golang.org/x/sync v0.16.0 // indirect + golang.org/x/sync v0.17.0 // indirect golang.org/x/sys v0.35.0 // indirect golang.org/x/term v0.34.0 // indirect golang.org/x/text v0.28.0 // indirect golang.org/x/time v0.12.0 // indirect gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect - google.golang.org/protobuf v1.36.7 // indirect + google.golang.org/protobuf v1.36.8 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect @@ -106,9 +106,9 @@ require ( k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect - knative.dev/eventing v0.46.1-0.20250829061938-3e86e9387750 // indirect - knative.dev/networking v0.0.0-20250820015349-8f495ee80e52 // indirect - knative.dev/serving v0.46.1-0.20250830231539-109f3f00a892 // indirect + knative.dev/eventing v0.46.1-0.20250908062745-c9cfca897068 // indirect + knative.dev/networking v0.0.0-20250903015244-1dd9be99b5c9 // indirect + knative.dev/serving v0.46.1-0.20250905135143-6bab56591b55 // indirect sigs.k8s.io/gateway-api v1.1.0 // indirect sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect diff --git a/go.sum b/go.sum index ff0e25260..bf5486698 100644 --- a/go.sum +++ b/go.sum @@ -270,13 +270,13 @@ github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qR github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.23.0 h1:ust4zpdl9r4trLY/gSjlm07PuiBq2ynaXXlptpfy8Uc= -github.com/prometheus/client_golang v1.23.0/go.mod h1:i/o0R9ByOnHX0McrTMTyhYvKE4haaf2mW08I+jGAjEE= +github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o= +github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk= github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= -github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE= -github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8= +github.com/prometheus/common v0.66.1 h1:h5E0h5/Y8niHc5DlaLlWLArTQI7tMrsfQjHV+d9ZoGs= +github.com/prometheus/common v0.66.1/go.mod h1:gcaUsgf3KfRSwHY4dIMXLPV0K/Wg1oZ8+SbZk/HH/dA= github.com/prometheus/otlptranslator v0.0.0-20250717125610-8549f4ab4f8f h1:QQB6SuvGZjK8kdc2YaLJpYhV8fxauOsjE6jgcL6YJ8Q= github.com/prometheus/otlptranslator v0.0.0-20250717125610-8549f4ab4f8f/go.mod h1:P8AwMgdD7XEr6QRUJ2QWLpiAZTgTE2UYgjlu3svompI= github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0= @@ -489,8 +489,8 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= -golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= +golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -701,8 +701,8 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A= -google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= +google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc= +google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= @@ -747,20 +747,20 @@ k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUy k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8= k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0= k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -knative.dev/client/pkg v0.0.0-20250901022440-5d83f5ca1c77 h1:J1NypQZm93enGgyHf1uVIfzqLuoluGzohAMIYE15G9k= -knative.dev/client/pkg v0.0.0-20250901022440-5d83f5ca1c77/go.mod h1:ciFzqvuixRHJk/MywR0AIFeICpQjSjgwT3BLO6nivlg= -knative.dev/eventing v0.46.1-0.20250829061938-3e86e9387750 h1:ZqFoKQxx+t6kMp0dhseLj1BEkzj3KnmrTR0l3DEQ6Mg= -knative.dev/eventing v0.46.1-0.20250829061938-3e86e9387750/go.mod h1:LGrT69aBGGhjY+hmO7wwJzBQLCqkhJf10v9fcorJHKY= -knative.dev/eventing-kafka-broker v0.46.1-0.20250902055842-bd49e7709170 h1:y//rdUEqLpWjbQ9Q4V/DUlirvaoLzrr1viAbNX+58eY= -knative.dev/eventing-kafka-broker v0.46.1-0.20250902055842-bd49e7709170/go.mod h1:PiyJTtQJ4tnaNqyixqEjGDXZECKvVV/ftooKtZlk3bc= +knative.dev/client/pkg v0.0.0-20250908140348-a01fc2fb038c h1:tlUFUTjvL8Y76VHV3a40T1nS7mFiPWTr8ojl2EAdCRw= +knative.dev/client/pkg v0.0.0-20250908140348-a01fc2fb038c/go.mod h1:PK3no+3UPgfu4WeRtLahrG00osghHip+mr7au5oOZnY= +knative.dev/eventing v0.46.1-0.20250908062745-c9cfca897068 h1:Qa8Kqsh7m5WCfUdrPCwTVEethluJ53GIPTZKHIt3CH0= +knative.dev/eventing v0.46.1-0.20250908062745-c9cfca897068/go.mod h1:Cbonqnx7nVDpS7bbjZxm7ouDecCfdk2Xx5m2P7EAuj4= +knative.dev/eventing-kafka-broker v0.46.1-0.20250908122347-20212a58b91a h1:ZfoQiwCnHK7bw7vbFf5EfClHBa4Qw3GybVMJ40H8/xs= +knative.dev/eventing-kafka-broker v0.46.1-0.20250908122347-20212a58b91a/go.mod h1:PiyJTtQJ4tnaNqyixqEjGDXZECKvVV/ftooKtZlk3bc= knative.dev/hack v0.0.0-20250902153942-1499de21e119 h1:NbQvjnFK1tL489LN0qAybWy0E17Jpziwcv/XIHwfp6M= knative.dev/hack v0.0.0-20250902153942-1499de21e119/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= -knative.dev/networking v0.0.0-20250820015349-8f495ee80e52 h1:otZjfxLAOcn1wV9Yl8i7VZ4aDWiS2NEo2Kyg3b0a4pA= -knative.dev/networking v0.0.0-20250820015349-8f495ee80e52/go.mod h1:rEXgxXZ7rmrif823YRJgaQO89jySTDor0NNEq6tlC6Q= -knative.dev/pkg v0.0.0-20250903014743-528bde37b646 h1:90qlepWL0OJjPN8bkwX7CiyUwMGcGi++mslcbfIKNfQ= -knative.dev/pkg v0.0.0-20250903014743-528bde37b646/go.mod h1:ROyn4KNeXnoDS85bZkA7wiVpZgqZCukoh8u6xrDZyHo= -knative.dev/serving v0.46.1-0.20250830231539-109f3f00a892 h1:WAqiayiyAzuyEgNBnQu2At0Zxh5r1IyCZr+s+H/OqXk= -knative.dev/serving v0.46.1-0.20250830231539-109f3f00a892/go.mod h1:PGfROWOyTtcs2qOk9JRv4ZTJMxMjZPyyI9RSUMOY6Sw= +knative.dev/networking v0.0.0-20250903015244-1dd9be99b5c9 h1:upUH3vfEUpTZOmBqbfBeWaaywodeHeE6l9W96Gx4IEE= +knative.dev/networking v0.0.0-20250903015244-1dd9be99b5c9/go.mod h1:0U6fhV37+SthfCKiPK7WwMNhoiH/xhpztEVfi7FpjkY= +knative.dev/pkg v0.0.0-20250909010931-8c9c1d368e4b h1:Gscoeovr8XvQffYg6l2d7V8M5FuaJg34Hjg8e9sg21Y= +knative.dev/pkg v0.0.0-20250909010931-8c9c1d368e4b/go.mod h1:OLfYBCgDhdEpaC2TEixU3e7byMEQmke/MHP3xsR7Gmo= +knative.dev/serving v0.46.1-0.20250905135143-6bab56591b55 h1:8LalhZhcjcm3HjaJ2mb7WqECE9HS451UBcWSD/LQ0WI= +knative.dev/serving v0.46.1-0.20250905135143-6bab56591b55/go.mod h1:i/Y4PwFeTihf3fjCQ6zd8d8tu5c5yxwabOxysL3aGDk= 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/protobuf/internal/genid/api_gen.go b/vendor/google.golang.org/protobuf/internal/genid/api_gen.go index df8f91850..3ceb6fa7f 100644 --- a/vendor/google.golang.org/protobuf/internal/genid/api_gen.go +++ b/vendor/google.golang.org/protobuf/internal/genid/api_gen.go @@ -27,6 +27,7 @@ const ( Api_SourceContext_field_name protoreflect.Name = "source_context" Api_Mixins_field_name protoreflect.Name = "mixins" Api_Syntax_field_name protoreflect.Name = "syntax" + Api_Edition_field_name protoreflect.Name = "edition" Api_Name_field_fullname protoreflect.FullName = "google.protobuf.Api.name" Api_Methods_field_fullname protoreflect.FullName = "google.protobuf.Api.methods" @@ -35,6 +36,7 @@ const ( Api_SourceContext_field_fullname protoreflect.FullName = "google.protobuf.Api.source_context" Api_Mixins_field_fullname protoreflect.FullName = "google.protobuf.Api.mixins" Api_Syntax_field_fullname protoreflect.FullName = "google.protobuf.Api.syntax" + Api_Edition_field_fullname protoreflect.FullName = "google.protobuf.Api.edition" ) // Field numbers for google.protobuf.Api. @@ -46,6 +48,7 @@ const ( Api_SourceContext_field_number protoreflect.FieldNumber = 5 Api_Mixins_field_number protoreflect.FieldNumber = 6 Api_Syntax_field_number protoreflect.FieldNumber = 7 + Api_Edition_field_number protoreflect.FieldNumber = 8 ) // Names for google.protobuf.Method. @@ -63,6 +66,7 @@ const ( Method_ResponseStreaming_field_name protoreflect.Name = "response_streaming" Method_Options_field_name protoreflect.Name = "options" Method_Syntax_field_name protoreflect.Name = "syntax" + Method_Edition_field_name protoreflect.Name = "edition" Method_Name_field_fullname protoreflect.FullName = "google.protobuf.Method.name" Method_RequestTypeUrl_field_fullname protoreflect.FullName = "google.protobuf.Method.request_type_url" @@ -71,6 +75,7 @@ const ( Method_ResponseStreaming_field_fullname protoreflect.FullName = "google.protobuf.Method.response_streaming" Method_Options_field_fullname protoreflect.FullName = "google.protobuf.Method.options" Method_Syntax_field_fullname protoreflect.FullName = "google.protobuf.Method.syntax" + Method_Edition_field_fullname protoreflect.FullName = "google.protobuf.Method.edition" ) // Field numbers for google.protobuf.Method. @@ -82,6 +87,7 @@ const ( Method_ResponseStreaming_field_number protoreflect.FieldNumber = 5 Method_Options_field_number protoreflect.FieldNumber = 6 Method_Syntax_field_number protoreflect.FieldNumber = 7 + Method_Edition_field_number protoreflect.FieldNumber = 8 ) // Names for google.protobuf.Mixin. diff --git a/vendor/google.golang.org/protobuf/internal/version/version.go b/vendor/google.golang.org/protobuf/internal/version/version.go index a53364c59..697d1c14f 100644 --- a/vendor/google.golang.org/protobuf/internal/version/version.go +++ b/vendor/google.golang.org/protobuf/internal/version/version.go @@ -52,7 +52,7 @@ import ( const ( Major = 1 Minor = 36 - Patch = 7 + Patch = 8 PreRelease = "" ) diff --git a/vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go b/vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go index 6843b0bea..4eacb523c 100644 --- a/vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go +++ b/vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go @@ -2873,7 +2873,10 @@ type FieldOptions struct { // for accessors, or it will be completely ignored; in the very least, this // is a formalization for deprecating fields. Deprecated *bool `protobuf:"varint,3,opt,name=deprecated,def=0" json:"deprecated,omitempty"` + // DEPRECATED. DO NOT USE! // For Google-internal migration only. Do not use. + // + // Deprecated: Marked as deprecated in google/protobuf/descriptor.proto. Weak *bool `protobuf:"varint,10,opt,name=weak,def=0" json:"weak,omitempty"` // Indicate that the field value should not be printed out when using debug // formats, e.g. when the field contains sensitive credentials. @@ -2977,6 +2980,7 @@ func (x *FieldOptions) GetDeprecated() bool { return Default_FieldOptions_Deprecated } +// Deprecated: Marked as deprecated in google/protobuf/descriptor.proto. func (x *FieldOptions) GetWeak() bool { if x != nil && x.Weak != nil { return *x.Weak @@ -4843,7 +4847,7 @@ const file_google_protobuf_descriptor_proto_rawDesc = "" + "&deprecated_legacy_json_field_conflicts\x18\v \x01(\bB\x02\x18\x01R\"deprecatedLegacyJsonFieldConflicts\x127\n" + "\bfeatures\x18\f \x01(\v2\x1b.google.protobuf.FeatureSetR\bfeatures\x12X\n" + "\x14uninterpreted_option\x18\xe7\a \x03(\v2$.google.protobuf.UninterpretedOptionR\x13uninterpretedOption*\t\b\xe8\a\x10\x80\x80\x80\x80\x02J\x04\b\x04\x10\x05J\x04\b\x05\x10\x06J\x04\b\x06\x10\aJ\x04\b\b\x10\tJ\x04\b\t\x10\n" + - "\"\x9d\r\n" + + "\"\xa1\r\n" + "\fFieldOptions\x12A\n" + "\x05ctype\x18\x01 \x01(\x0e2#.google.protobuf.FieldOptions.CType:\x06STRINGR\x05ctype\x12\x16\n" + "\x06packed\x18\x02 \x01(\bR\x06packed\x12G\n" + @@ -4852,9 +4856,9 @@ const file_google_protobuf_descriptor_proto_rawDesc = "" + "\x0funverified_lazy\x18\x0f \x01(\b:\x05falseR\x0eunverifiedLazy\x12%\n" + "\n" + "deprecated\x18\x03 \x01(\b:\x05falseR\n" + - "deprecated\x12\x19\n" + + "deprecated\x12\x1d\n" + "\x04weak\x18\n" + - " \x01(\b:\x05falseR\x04weak\x12(\n" + + " \x01(\b:\x05falseB\x02\x18\x01R\x04weak\x12(\n" + "\fdebug_redact\x18\x10 \x01(\b:\x05falseR\vdebugRedact\x12K\n" + "\tretention\x18\x11 \x01(\x0e2-.google.protobuf.FieldOptions.OptionRetentionR\tretention\x12H\n" + "\atargets\x18\x13 \x03(\x0e2..google.protobuf.FieldOptions.OptionTargetTypeR\atargets\x12W\n" + diff --git a/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/requestreply_defaults.go b/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/requestreply_defaults.go index c05f915d1..eda47de36 100644 --- a/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/requestreply_defaults.go +++ b/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/requestreply_defaults.go @@ -27,6 +27,12 @@ import ( func (rr *RequestReply) SetDefaults(ctx context.Context) { ctx = apis.WithinParent(ctx, rr.ObjectMeta) rr.Spec.SetDefaults(ctx) + + if rr.Labels == nil { + rr.Labels = make(map[string]string) + } + + rr.Labels["eventing.knative.dev/broker"] = rr.Spec.BrokerRef.Name } func (rrs *RequestReplySpec) SetDefaults(ctx context.Context) { @@ -41,4 +47,5 @@ func (rrs *RequestReplySpec) SetDefaults(ctx context.Context) { if rrs.ReplyAttribute == "" { rrs.ReplyAttribute = "replyid" } + } diff --git a/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/requestreply_lifecycle.go b/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/requestreply_lifecycle.go index 670142290..09d0ebcdd 100644 --- a/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/requestreply_lifecycle.go +++ b/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/requestreply_lifecycle.go @@ -21,14 +21,14 @@ import ( v1 "knative.dev/pkg/apis/duck/v1" ) -var requestReplyCondSet = apis.NewLivingConditionSet(RequestReplyConditionIngress, RequestReplyConditionTriggers, RequestReplyConditionAddressable, RequestReplyConditionEventPoliciesReady) +var requestReplyCondSet = apis.NewLivingConditionSet(RequestReplyConditionTriggers, RequestReplyConditionAddressable, RequestReplyConditionEventPoliciesReady, RequestReplyConditionBrokerReady) const ( RequestReplyConditionReady = apis.ConditionReady - RequestReplyConditionIngress apis.ConditionType = "IngressReady" RequestReplyConditionTriggers apis.ConditionType = "TriggersReady" RequestReplyConditionAddressable apis.ConditionType = "Addressable" RequestReplyConditionEventPoliciesReady apis.ConditionType = "EventPoliciesReady" + RequestReplyConditionBrokerReady apis.ConditionType = "BrokerReady" ) // GetConditionSet retrieves the condition set for this resource. Implements the KRShaped interface. @@ -81,14 +81,6 @@ func (rr *RequestReplyStatus) MarkTriggersNotReadyWithReason(reason, messageForm rr.GetConditionSet().Manage(rr).MarkUnknown(RequestReplyConditionTriggers, reason, messageFormat, messageA...) } -func (rr *RequestReplyStatus) MarkIngressReady() { - rr.GetConditionSet().Manage(rr).MarkTrue(RequestReplyConditionIngress) -} - -func (rr *RequestReplyStatus) MarkIngressNotReadyWithReason(reason, messageFormat string, messageA ...interface{}) { - rr.GetConditionSet().Manage(rr).MarkUnknown(RequestReplyConditionIngress, reason, messageFormat, messageA...) -} - func (rr *RequestReplyStatus) MarkEventPoliciesTrue() { rr.GetConditionSet().Manage(rr).MarkTrue(RequestReplyConditionEventPoliciesReady) } @@ -104,3 +96,15 @@ func (rr *RequestReplyStatus) MarkEventPoliciesFailed(reason, messageFormat stri func (rr *RequestReplyStatus) MarkEventPoliciesUnknown(reason, messageFormat string, messageA ...interface{}) { rr.GetConditionSet().Manage(rr).MarkUnknown(RequestReplyConditionEventPoliciesReady, reason, messageFormat, messageA...) } + +func (rr *RequestReplyStatus) MarkBrokerReady() { + rr.GetConditionSet().Manage(rr).MarkTrue(RequestReplyConditionBrokerReady) +} + +func (rr *RequestReplyStatus) MarkBrokerNotReady(reason, messageFormat string, messageA ...interface{}) { + rr.GetConditionSet().Manage(rr).MarkFalse(RequestReplyConditionBrokerReady, reason, messageFormat, messageA...) +} + +func (rr *RequestReplyStatus) MarkBrokerUnknown(reason, messageFormat string, messageA ...interface{}) { + rr.GetConditionSet().Manage(rr).MarkUnknown(RequestReplyConditionBrokerReady, reason, messageFormat, messageA...) +} diff --git a/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/requestreply_types.go b/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/requestreply_types.go index d3015fbae..52340f6d9 100644 --- a/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/requestreply_types.go +++ b/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/requestreply_types.go @@ -76,8 +76,6 @@ type RequestReplySpec struct { Timeout *string `json:"timeout,omitempty"` Delivery *eventingduckv1.DeliverySpec `json:"delivery,omitempty"` - - Secrets []string `json:"secrets"` } // RequestReplyStatus represents the current state of a RequestReply. @@ -95,6 +93,12 @@ type RequestReplyStatus struct { // AppliedEventPoliciesStatus contains the list of EventPolicies which apply to this Broker. // +optional eventingduckv1.AppliedEventPoliciesStatus `json:",inline"` + + // DesiredReplicas is the number of replicas (StatefulSet pod + trigger) that is desired + DesiredReplicas *int32 `json:"desiredReplicas,omitempty"` + + // ReadyReplicas is the number of ready replicas (StatefulSet pod + trigger) for this RequestReply resource + ReadyReplicas *int32 `json:"readyReplicas,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff --git a/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/requestreply_validation.go b/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/requestreply_validation.go index 693c5a789..a37cb774a 100644 --- a/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/requestreply_validation.go +++ b/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/requestreply_validation.go @@ -53,14 +53,13 @@ func (rrs *RequestReplySpec) Validate(ctx context.Context) *apis.FieldError { if rrs.Timeout != nil { timeout, err := period.Parse(*rrs.Timeout) - if err != nil || timeout.IsZero() || timeout.IsNegative() { - errs = errs.Also(apis.ErrInvalidValue(*rrs.Timeout, "timeout")) + if err != nil { + errs = errs.Also(apis.ErrInvalidValue(*rrs.Timeout, "timeout", err.Error())) + } else if timeout.IsNegative() || timeout.IsZero() { + errs = errs.Also(apis.ErrInvalidValue(*rrs.Timeout, "timeout", "timeout must be a positive duration")) } - - } - - if len(rrs.Secrets) == 0 { - errs = errs.Also(apis.ErrInvalidValue(rrs.Secrets, "secrets", "one or more secrets must be provided")) + } else { + errs = errs.Also(apis.ErrMissingField("timeout")) } if rrs.CorrelationAttribute == "" || diff --git a/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/zz_generated.deepcopy.go b/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/zz_generated.deepcopy.go index 03129c83e..0cfffa2db 100644 --- a/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/zz_generated.deepcopy.go @@ -521,11 +521,6 @@ func (in *RequestReplySpec) DeepCopyInto(out *RequestReplySpec) { *out = new(apisduckv1.DeliverySpec) (*in).DeepCopyInto(*out) } - if in.Secrets != nil { - in, out := &in.Secrets, &out.Secrets - *out = make([]string, len(*in)) - copy(*out, *in) - } return } @@ -545,6 +540,16 @@ func (in *RequestReplyStatus) DeepCopyInto(out *RequestReplyStatus) { in.Status.DeepCopyInto(&out.Status) in.AddressStatus.DeepCopyInto(&out.AddressStatus) in.AppliedEventPoliciesStatus.DeepCopyInto(&out.AppliedEventPoliciesStatus) + if in.DesiredReplicas != nil { + in, out := &in.DesiredReplicas, &out.DesiredReplicas + *out = new(int32) + **out = **in + } + if in.ReadyReplicas != nil { + in, out := &in.ReadyReplicas, &out.ReadyReplicas + *out = new(int32) + **out = **in + } return } diff --git a/vendor/knative.dev/eventing/pkg/apis/feature/features.go b/vendor/knative.dev/eventing/pkg/apis/feature/features.go index e3f0f3d3e..a8ee4209b 100644 --- a/vendor/knative.dev/eventing/pkg/apis/feature/features.go +++ b/vendor/knative.dev/eventing/pkg/apis/feature/features.go @@ -70,7 +70,7 @@ const ( // DefaultRequestReplyTimeout is a value for RequestReplyDefaultTimeout that indicates to timeout // a RequestReply resource after 30 seconds by default. - DefaultRequestReplyTimeout Flag = "30s" + DefaultRequestReplyTimeout Flag = "PT30S" ) // Flags is a map containing all the enabled/disabled flags for the experimental features. diff --git a/vendor/knative.dev/pkg/controller/controller.go b/vendor/knative.dev/pkg/controller/controller.go index 7846399ed..6091f55fd 100644 --- a/vendor/knative.dev/pkg/controller/controller.go +++ b/vendor/knative.dev/pkg/controller/controller.go @@ -470,7 +470,7 @@ func (c *Impl) RunContext(ctx context.Context, threadiness int) error { } // Launch workers to process resources that get enqueued to our workqueue. - c.logger.Info("Starting controller and workers") + c.logger.Infow("Starting controller and workers", zap.Int("threadiness", threadiness)) for range threadiness { sg.Add(1) go func() { diff --git a/vendor/knative.dev/pkg/controller/queue_metrics.go b/vendor/knative.dev/pkg/controller/queue_metrics.go index dcd588998..2e61e330e 100644 --- a/vendor/knative.dev/pkg/controller/queue_metrics.go +++ b/vendor/knative.dev/pkg/controller/queue_metrics.go @@ -88,13 +88,15 @@ func (m *queueMetrics) get(item any) { m.mu.Lock() defer m.mu.Unlock() - m.depth.Dec() - m.processingStartTimes[item] = m.clock.Now() - if startTime, exists := m.addTimes[item]; exists { + m.depth.Dec() m.latency.Observe(m.sinceInSeconds(startTime)) delete(m.addTimes, item) } + + if _, exists := m.processingStartTimes[item]; !exists { + m.processingStartTimes[item] = m.clock.Now() + } } func (m *queueMetrics) done(item any) { diff --git a/vendor/knative.dev/pkg/controller/two_lane_queue.go b/vendor/knative.dev/pkg/controller/two_lane_queue.go index 294255131..0c1879ded 100644 --- a/vendor/knative.dev/pkg/controller/two_lane_queue.go +++ b/vendor/knative.dev/pkg/controller/two_lane_queue.go @@ -223,9 +223,9 @@ func (q *twoLaneRateLimitingQueue) slowLane() workqueue.TypedInterface[any] { // It gets the item from fast lane if it has anything, alternatively // the slow lane. func (tlq *twoLaneQueue) Get() (any, bool) { - item, ok := tlq.consumerQueue.Get() + item, shutdown := tlq.consumerQueue.Get() tlq.metrics.get(item) - return item, ok + return item, shutdown } // Len returns the sum of lengths. diff --git a/vendor/modules.txt b/vendor/modules.txt index 4a5e4f0e8..929e025ef 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -326,8 +326,8 @@ golang.org/x/net/internal/httpcommon ## explicit; go 1.23.0 golang.org/x/oauth2 golang.org/x/oauth2/internal -# golang.org/x/sync v0.16.0 -## explicit; go 1.23.0 +# golang.org/x/sync v0.17.0 +## explicit; go 1.24.0 golang.org/x/sync/errgroup # golang.org/x/sys v0.35.0 ## explicit; go 1.23.0 @@ -355,8 +355,8 @@ golang.org/x/time/rate # gomodules.xyz/jsonpatch/v2 v2.5.0 ## explicit; go 1.20 gomodules.xyz/jsonpatch/v2 -# google.golang.org/protobuf v1.36.7 -## explicit; go 1.22 +# google.golang.org/protobuf v1.36.8 +## explicit; go 1.23 google.golang.org/protobuf/encoding/prototext google.golang.org/protobuf/encoding/protowire google.golang.org/protobuf/internal/descfmt @@ -857,7 +857,7 @@ k8s.io/utils/net k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/trace -# knative.dev/client/pkg v0.0.0-20250901022440-5d83f5ca1c77 +# knative.dev/client/pkg v0.0.0-20250908140348-a01fc2fb038c ## explicit; go 1.24.0 knative.dev/client/pkg/apis/client knative.dev/client/pkg/apis/client/v1alpha1 @@ -884,7 +884,7 @@ knative.dev/client/pkg/util/errors knative.dev/client/pkg/util/mock knative.dev/client/pkg/util/test knative.dev/client/pkg/wait -# knative.dev/eventing v0.46.1-0.20250829061938-3e86e9387750 +# knative.dev/eventing v0.46.1-0.20250908062745-c9cfca897068 ## explicit; go 1.24.0 knative.dev/eventing/pkg/apis/common/integration/v1alpha1 knative.dev/eventing/pkg/apis/config @@ -918,7 +918,7 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1 knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake knative.dev/eventing/pkg/crossnamespace knative.dev/eventing/pkg/eventingtls -# knative.dev/eventing-kafka-broker v0.46.1-0.20250902055842-bd49e7709170 +# knative.dev/eventing-kafka-broker v0.46.1-0.20250908122347-20212a58b91a ## explicit; go 1.24.0 knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1 @@ -939,7 +939,7 @@ knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/t # knative.dev/hack v0.0.0-20250902153942-1499de21e119 ## explicit; go 1.21 knative.dev/hack -# knative.dev/networking v0.0.0-20250820015349-8f495ee80e52 +# knative.dev/networking v0.0.0-20250903015244-1dd9be99b5c9 ## explicit; go 1.24.0 knative.dev/networking/pkg knative.dev/networking/pkg/apis/networking @@ -952,7 +952,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-20250903014743-528bde37b646 +# knative.dev/pkg v0.0.0-20250909010931-8c9c1d368e4b ## explicit; go 1.24.0 knative.dev/pkg/apis knative.dev/pkg/apis/duck @@ -996,7 +996,7 @@ knative.dev/pkg/test/logging knative.dev/pkg/test/spoof knative.dev/pkg/tracker knative.dev/pkg/webhook/resourcesemantics -# knative.dev/serving v0.46.1-0.20250830231539-109f3f00a892 +# knative.dev/serving v0.46.1-0.20250905135143-6bab56591b55 ## explicit; go 1.24.0 knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1