Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
40 changes: 20 additions & 20 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand Down
6 changes: 6 additions & 0 deletions vendor/google.golang.org/protobuf/internal/genid/api_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -41,4 +47,5 @@ func (rrs *RequestReplySpec) SetDefaults(ctx context.Context) {
if rrs.ReplyAttribute == "" {
rrs.ReplyAttribute = "replyid"
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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)
}
Expand All @@ -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...)
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 == "" ||
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading