Skip to content

Commit 52228d2

Browse files
upgrade to latest dependencies (#619)
bumping knative.dev/eventing 3e86e93...c9cfca8: > c9cfca8 Update request reply types (# 8698) > ea44c30 [Automated] Update eventing-eventing-integrations nightly (# 8702) > e24129c feat: enable KN_VERIFY_CORRELATION_ID in cesql runtimes (# 8700) > 8c44e16 [main] Upgrade to latest dependencies (# 8695) bumping knative.dev/serving 961ce6a...6bab565: > 6bab565 approve workflows if ok-to-test label is present (# 16054) > 36ddb35 Update net-istio nightly (# 16064) > 45bf006 Update net-contour nightly (# 16067) > 4b1cb5b Update net-kourier nightly (# 16066) > 0237da7 Update net-gateway-api nightly (# 16065) > a0e1543 Serving Metric Tweaks (# 16062) > 1fb2561 Update net-istio nightly (# 16059) > 3ba1c33 Update net-kourier nightly (# 16058) > 790ea34 Update net-contour nightly (# 16057) > 80b3b0d Update net-gateway-api nightly (# 16060) > 74eb3dc upgrade to latest dependencies (# 16055) Signed-off-by: Knative Automation <[email protected]>
1 parent 8772b8a commit 52228d2

File tree

9 files changed

+52
-33
lines changed

9 files changed

+52
-33
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ require (
1515
k8s.io/apimachinery v0.33.4
1616
k8s.io/client-go v0.33.4
1717
k8s.io/code-generator v0.33.4
18-
knative.dev/eventing v0.46.1-0.20250829061938-3e86e9387750
18+
knative.dev/eventing v0.46.1-0.20250908062745-c9cfca897068
1919
knative.dev/hack v0.0.0-20250902153942-1499de21e119
2020
knative.dev/pkg v0.0.0-20250903014743-528bde37b646
21-
knative.dev/serving v0.46.1-0.20250902142643-961ce6a48d2e
21+
knative.dev/serving v0.46.1-0.20250905135143-6bab56591b55
2222
)
2323

2424
require (

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -374,16 +374,16 @@ k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUy
374374
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
375375
k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
376376
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
377-
knative.dev/eventing v0.46.1-0.20250829061938-3e86e9387750 h1:ZqFoKQxx+t6kMp0dhseLj1BEkzj3KnmrTR0l3DEQ6Mg=
378-
knative.dev/eventing v0.46.1-0.20250829061938-3e86e9387750/go.mod h1:LGrT69aBGGhjY+hmO7wwJzBQLCqkhJf10v9fcorJHKY=
377+
knative.dev/eventing v0.46.1-0.20250908062745-c9cfca897068 h1:Qa8Kqsh7m5WCfUdrPCwTVEethluJ53GIPTZKHIt3CH0=
378+
knative.dev/eventing v0.46.1-0.20250908062745-c9cfca897068/go.mod h1:Cbonqnx7nVDpS7bbjZxm7ouDecCfdk2Xx5m2P7EAuj4=
379379
knative.dev/hack v0.0.0-20250902153942-1499de21e119 h1:NbQvjnFK1tL489LN0qAybWy0E17Jpziwcv/XIHwfp6M=
380380
knative.dev/hack v0.0.0-20250902153942-1499de21e119/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
381381
knative.dev/networking v0.0.0-20250820015349-8f495ee80e52 h1:otZjfxLAOcn1wV9Yl8i7VZ4aDWiS2NEo2Kyg3b0a4pA=
382382
knative.dev/networking v0.0.0-20250820015349-8f495ee80e52/go.mod h1:rEXgxXZ7rmrif823YRJgaQO89jySTDor0NNEq6tlC6Q=
383383
knative.dev/pkg v0.0.0-20250903014743-528bde37b646 h1:90qlepWL0OJjPN8bkwX7CiyUwMGcGi++mslcbfIKNfQ=
384384
knative.dev/pkg v0.0.0-20250903014743-528bde37b646/go.mod h1:ROyn4KNeXnoDS85bZkA7wiVpZgqZCukoh8u6xrDZyHo=
385-
knative.dev/serving v0.46.1-0.20250902142643-961ce6a48d2e h1:cnfymo+aDT//LG8vUUEq+DALWuJ439g/61rgaUlf79k=
386-
knative.dev/serving v0.46.1-0.20250902142643-961ce6a48d2e/go.mod h1:PGfROWOyTtcs2qOk9JRv4ZTJMxMjZPyyI9RSUMOY6Sw=
385+
knative.dev/serving v0.46.1-0.20250905135143-6bab56591b55 h1:8LalhZhcjcm3HjaJ2mb7WqECE9HS451UBcWSD/LQ0WI=
386+
knative.dev/serving v0.46.1-0.20250905135143-6bab56591b55/go.mod h1:i/Y4PwFeTihf3fjCQ6zd8d8tu5c5yxwabOxysL3aGDk=
387387
sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM=
388388
sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs=
389389
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/requestreply_defaults.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ import (
2727
func (rr *RequestReply) SetDefaults(ctx context.Context) {
2828
ctx = apis.WithinParent(ctx, rr.ObjectMeta)
2929
rr.Spec.SetDefaults(ctx)
30+
31+
if rr.Labels == nil {
32+
rr.Labels = make(map[string]string)
33+
}
34+
35+
rr.Labels["eventing.knative.dev/broker"] = rr.Spec.BrokerRef.Name
3036
}
3137

3238
func (rrs *RequestReplySpec) SetDefaults(ctx context.Context) {
@@ -41,4 +47,5 @@ func (rrs *RequestReplySpec) SetDefaults(ctx context.Context) {
4147
if rrs.ReplyAttribute == "" {
4248
rrs.ReplyAttribute = "replyid"
4349
}
50+
4451
}

vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/requestreply_lifecycle.go

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ import (
2121
v1 "knative.dev/pkg/apis/duck/v1"
2222
)
2323

24-
var requestReplyCondSet = apis.NewLivingConditionSet(RequestReplyConditionIngress, RequestReplyConditionTriggers, RequestReplyConditionAddressable, RequestReplyConditionEventPoliciesReady)
24+
var requestReplyCondSet = apis.NewLivingConditionSet(RequestReplyConditionTriggers, RequestReplyConditionAddressable, RequestReplyConditionEventPoliciesReady, RequestReplyConditionBrokerReady)
2525

2626
const (
2727
RequestReplyConditionReady = apis.ConditionReady
28-
RequestReplyConditionIngress apis.ConditionType = "IngressReady"
2928
RequestReplyConditionTriggers apis.ConditionType = "TriggersReady"
3029
RequestReplyConditionAddressable apis.ConditionType = "Addressable"
3130
RequestReplyConditionEventPoliciesReady apis.ConditionType = "EventPoliciesReady"
31+
RequestReplyConditionBrokerReady apis.ConditionType = "BrokerReady"
3232
)
3333

3434
// GetConditionSet retrieves the condition set for this resource. Implements the KRShaped interface.
@@ -81,14 +81,6 @@ func (rr *RequestReplyStatus) MarkTriggersNotReadyWithReason(reason, messageForm
8181
rr.GetConditionSet().Manage(rr).MarkUnknown(RequestReplyConditionTriggers, reason, messageFormat, messageA...)
8282
}
8383

84-
func (rr *RequestReplyStatus) MarkIngressReady() {
85-
rr.GetConditionSet().Manage(rr).MarkTrue(RequestReplyConditionIngress)
86-
}
87-
88-
func (rr *RequestReplyStatus) MarkIngressNotReadyWithReason(reason, messageFormat string, messageA ...interface{}) {
89-
rr.GetConditionSet().Manage(rr).MarkUnknown(RequestReplyConditionIngress, reason, messageFormat, messageA...)
90-
}
91-
9284
func (rr *RequestReplyStatus) MarkEventPoliciesTrue() {
9385
rr.GetConditionSet().Manage(rr).MarkTrue(RequestReplyConditionEventPoliciesReady)
9486
}
@@ -104,3 +96,15 @@ func (rr *RequestReplyStatus) MarkEventPoliciesFailed(reason, messageFormat stri
10496
func (rr *RequestReplyStatus) MarkEventPoliciesUnknown(reason, messageFormat string, messageA ...interface{}) {
10597
rr.GetConditionSet().Manage(rr).MarkUnknown(RequestReplyConditionEventPoliciesReady, reason, messageFormat, messageA...)
10698
}
99+
100+
func (rr *RequestReplyStatus) MarkBrokerReady() {
101+
rr.GetConditionSet().Manage(rr).MarkTrue(RequestReplyConditionBrokerReady)
102+
}
103+
104+
func (rr *RequestReplyStatus) MarkBrokerNotReady(reason, messageFormat string, messageA ...interface{}) {
105+
rr.GetConditionSet().Manage(rr).MarkFalse(RequestReplyConditionBrokerReady, reason, messageFormat, messageA...)
106+
}
107+
108+
func (rr *RequestReplyStatus) MarkBrokerUnknown(reason, messageFormat string, messageA ...interface{}) {
109+
rr.GetConditionSet().Manage(rr).MarkUnknown(RequestReplyConditionBrokerReady, reason, messageFormat, messageA...)
110+
}

vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/requestreply_types.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ type RequestReplySpec struct {
7676
Timeout *string `json:"timeout,omitempty"`
7777

7878
Delivery *eventingduckv1.DeliverySpec `json:"delivery,omitempty"`
79-
80-
Secrets []string `json:"secrets"`
8179
}
8280

8381
// RequestReplyStatus represents the current state of a RequestReply.
@@ -95,6 +93,12 @@ type RequestReplyStatus struct {
9593
// AppliedEventPoliciesStatus contains the list of EventPolicies which apply to this Broker.
9694
// +optional
9795
eventingduckv1.AppliedEventPoliciesStatus `json:",inline"`
96+
97+
// DesiredReplicas is the number of replicas (StatefulSet pod + trigger) that is desired
98+
DesiredReplicas *int32 `json:"desiredReplicas,omitempty"`
99+
100+
// ReadyReplicas is the number of ready replicas (StatefulSet pod + trigger) for this RequestReply resource
101+
ReadyReplicas *int32 `json:"readyReplicas,omitempty"`
98102
}
99103

100104
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/requestreply_validation.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,13 @@ func (rrs *RequestReplySpec) Validate(ctx context.Context) *apis.FieldError {
5353

5454
if rrs.Timeout != nil {
5555
timeout, err := period.Parse(*rrs.Timeout)
56-
if err != nil || timeout.IsZero() || timeout.IsNegative() {
57-
errs = errs.Also(apis.ErrInvalidValue(*rrs.Timeout, "timeout"))
56+
if err != nil {
57+
errs = errs.Also(apis.ErrInvalidValue(*rrs.Timeout, "timeout", err.Error()))
58+
} else if timeout.IsNegative() || timeout.IsZero() {
59+
errs = errs.Also(apis.ErrInvalidValue(*rrs.Timeout, "timeout", "timeout must be a positive duration"))
5860
}
59-
60-
}
61-
62-
if len(rrs.Secrets) == 0 {
63-
errs = errs.Also(apis.ErrInvalidValue(rrs.Secrets, "secrets", "one or more secrets must be provided"))
61+
} else {
62+
errs = errs.Also(apis.ErrMissingField("timeout"))
6463
}
6564

6665
if rrs.CorrelationAttribute == "" ||

vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/zz_generated.deepcopy.go

Lines changed: 10 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/knative.dev/eventing/pkg/apis/feature/features.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ const (
7070

7171
// DefaultRequestReplyTimeout is a value for RequestReplyDefaultTimeout that indicates to timeout
7272
// a RequestReply resource after 30 seconds by default.
73-
DefaultRequestReplyTimeout Flag = "30s"
73+
DefaultRequestReplyTimeout Flag = "PT30S"
7474
)
7575

7676
// Flags is a map containing all the enabled/disabled flags for the experimental features.

vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,7 +1104,7 @@ k8s.io/utils/net
11041104
k8s.io/utils/pointer
11051105
k8s.io/utils/ptr
11061106
k8s.io/utils/trace
1107-
# knative.dev/eventing v0.46.1-0.20250829061938-3e86e9387750
1107+
# knative.dev/eventing v0.46.1-0.20250908062745-c9cfca897068
11081108
## explicit; go 1.24.0
11091109
knative.dev/eventing/pkg/adapter/v2
11101110
knative.dev/eventing/pkg/adapter/v2/test
@@ -1255,7 +1255,7 @@ knative.dev/pkg/webhook/psbinding
12551255
knative.dev/pkg/webhook/resourcesemantics
12561256
knative.dev/pkg/webhook/resourcesemantics/defaulting
12571257
knative.dev/pkg/webhook/resourcesemantics/validation
1258-
# knative.dev/serving v0.46.1-0.20250902142643-961ce6a48d2e
1258+
# knative.dev/serving v0.46.1-0.20250905135143-6bab56591b55
12591259
## explicit; go 1.24.0
12601260
knative.dev/serving/pkg/apis/autoscaling
12611261
knative.dev/serving/pkg/apis/autoscaling/v1alpha1

0 commit comments

Comments
 (0)