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
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ require (
k8s.io/apimachinery v0.33.4
k8s.io/client-go v0.33.4
k8s.io/code-generator v0.33.4
knative.dev/caching v0.0.0-20250820014647-11e4ce280c5a
knative.dev/eventing v0.46.1-0.20250829061938-3e86e9387750
knative.dev/caching v0.0.0-20250903014443-99773f99f3b6
knative.dev/eventing v0.46.1-0.20250908062745-c9cfca897068
knative.dev/hack v0.0.0-20250902153942-1499de21e119
knative.dev/pkg v0.0.0-20250820014848-e9c87121ec4c
knative.dev/reconciler-test v0.0.0-20250820021449-022fc4c64d88
knative.dev/serving v0.46.1-0.20250902142643-961ce6a48d2e
knative.dev/pkg v0.0.0-20250903014743-528bde37b646
knative.dev/reconciler-test v0.0.0-20250904013547-20f3cb2fc378
knative.dev/serving v0.46.1-0.20250905135143-6bab56591b55
sigs.k8s.io/yaml v1.6.0
)

Expand Down
20 changes: 10 additions & 10 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1703,20 +1703,20 @@ k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
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/caching v0.0.0-20250820014647-11e4ce280c5a h1:2FFehvh7YAf08pSVwcuyKa1y2+FdXazX/QPVmWTlLyA=
knative.dev/caching v0.0.0-20250820014647-11e4ce280c5a/go.mod h1:UUgBDm+cyerBihdyx2SAr88JMG4aQ2+srMiQd5d4ciM=
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/caching v0.0.0-20250903014443-99773f99f3b6 h1:DDgi+YeQQ1g1v3DTs08Sh5t6fkQYrI7yIDx+wx3VU3E=
knative.dev/caching v0.0.0-20250903014443-99773f99f3b6/go.mod h1:x+iEy4y5zR6Sh5nxsTLaMozk7ea7VDwnMdQT6qjWDDc=
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/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-20250820014848-e9c87121ec4c h1:l+HQf+byp7MpDz7A4GHyh6U0Yhf/T0A7zbl5EoLGado=
knative.dev/pkg v0.0.0-20250820014848-e9c87121ec4c/go.mod h1:sYOVxC0GXfovT2qiExFITWHnk0lm6m3WXrZHTsJvQ5k=
knative.dev/reconciler-test v0.0.0-20250820021449-022fc4c64d88 h1:wT1SPGxZ9UrM0vAPjcsYyDKBwKvtTkLc4iJFouImu+s=
knative.dev/reconciler-test v0.0.0-20250820021449-022fc4c64d88/go.mod h1:MHXIGpn/KLDlgUPs33NcPjH+3aYp/Hm/lxwFIPMuC0g=
knative.dev/serving v0.46.1-0.20250902142643-961ce6a48d2e h1:cnfymo+aDT//LG8vUUEq+DALWuJ439g/61rgaUlf79k=
knative.dev/serving v0.46.1-0.20250902142643-961ce6a48d2e/go.mod h1:PGfROWOyTtcs2qOk9JRv4ZTJMxMjZPyyI9RSUMOY6Sw=
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/reconciler-test v0.0.0-20250904013547-20f3cb2fc378 h1:mvnOMv1zs+beLfah6FpY1+bz/V68bBzwrVla8NvfTho=
knative.dev/reconciler-test v0.0.0-20250904013547-20f3cb2fc378/go.mod h1:tIDUu91ZDNmIIZGzRoX4gXzIZdbo5INPTFLzX9wwQfI=
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=
nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw=
pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
Expand Down
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.

2 changes: 1 addition & 1 deletion vendor/knative.dev/eventing/pkg/apis/feature/features.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 5 additions & 5 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1479,11 +1479,11 @@ k8s.io/utils/net
k8s.io/utils/pointer
k8s.io/utils/ptr
k8s.io/utils/trace
# knative.dev/caching v0.0.0-20250820014647-11e4ce280c5a
# knative.dev/caching v0.0.0-20250903014443-99773f99f3b6
## explicit; go 1.24.0
knative.dev/caching/pkg/apis/caching
knative.dev/caching/pkg/apis/caching/v1alpha1
# 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/cmd/heartbeats
knative.dev/eventing/pkg/apis
Expand Down Expand Up @@ -1596,7 +1596,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-20250820014848-e9c87121ec4c
# knative.dev/pkg v0.0.0-20250903014743-528bde37b646
## explicit; go 1.24.0
knative.dev/pkg/apiextensions/storageversion
knative.dev/pkg/apiextensions/storageversion/cmd/migrate
Expand Down Expand Up @@ -1685,7 +1685,7 @@ knative.dev/pkg/webhook
knative.dev/pkg/webhook/certificates
knative.dev/pkg/webhook/certificates/resources
knative.dev/pkg/webhook/resourcesemantics/conversion
# knative.dev/reconciler-test v0.0.0-20250820021449-022fc4c64d88
# knative.dev/reconciler-test v0.0.0-20250904013547-20f3cb2fc378
## explicit; go 1.24.0
knative.dev/reconciler-test/cmd/eventshub
knative.dev/reconciler-test/pkg/environment
Expand Down Expand Up @@ -1714,7 +1714,7 @@ knative.dev/reconciler-test/pkg/resources/service
knative.dev/reconciler-test/pkg/resources/serviceaccount
knative.dev/reconciler-test/pkg/state
knative.dev/reconciler-test/resources/certificate
# knative.dev/serving v0.46.1-0.20250902142643-961ce6a48d2e
# 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
Expand Down
Loading