Skip to content

Commit ab7325a

Browse files
upgrade to latest dependencies
bumping knative.dev/serving af2c899...75f7393: > 75f7393 Update net-gateway-api nightly (# 15355) bumping knative.dev/eventing 3b1bfb4...96c30bd: > 96c30bd List applying EventPolicies in Sequence status (# 8012) Signed-off-by: Knative Automation <[email protected]>
1 parent 085b1dc commit ab7325a

File tree

5 files changed

+73
-9
lines changed

5 files changed

+73
-9
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ require (
2222
k8s.io/code-generator v0.29.2
2323
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
2424
knative.dev/caching v0.0.0-20240626233642-b42b259a7e5f
25-
knative.dev/eventing v0.41.1-0.20240628173119-3b1bfb4674ca
25+
knative.dev/eventing v0.41.1-0.20240701131713-96c30bd21612
2626
knative.dev/hack v0.0.0-20240607132042-09143140a254
2727
knative.dev/pkg v0.0.0-20240626134149-3f6a546ac3a4
28-
knative.dev/serving v0.41.1-0.20240628165250-af2c8999e7bb
28+
knative.dev/serving v0.41.1-0.20240701085953-75f7393aaed4
2929
sigs.k8s.io/yaml v1.4.0
3030
)
3131

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1361,16 +1361,16 @@ k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCf
13611361
k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
13621362
knative.dev/caching v0.0.0-20240626233642-b42b259a7e5f h1:SPEsG7FI3wYRrKur3ehSOug2pLajN+3IPn0jMAh4dXc=
13631363
knative.dev/caching v0.0.0-20240626233642-b42b259a7e5f/go.mod h1:+zWxJUVU24/gsSSOKkP0/Vfwr+Wi4HH29sHxRn3AH9c=
1364-
knative.dev/eventing v0.41.1-0.20240628173119-3b1bfb4674ca h1:taxxQ07d3zNfCLNeG2200VOnMWGFB5OL3YA6JB4tqQY=
1365-
knative.dev/eventing v0.41.1-0.20240628173119-3b1bfb4674ca/go.mod h1:3h0QrfHELs61mrTI4GDPEQh4rwsap0YYA5XgRrNgnlc=
1364+
knative.dev/eventing v0.41.1-0.20240701131713-96c30bd21612 h1:Bs2fXBPUv+Df4YqIDNJRRRYGKrduST/AA4Foa9S23LA=
1365+
knative.dev/eventing v0.41.1-0.20240701131713-96c30bd21612/go.mod h1:3h0QrfHELs61mrTI4GDPEQh4rwsap0YYA5XgRrNgnlc=
13661366
knative.dev/hack v0.0.0-20240607132042-09143140a254 h1:1YFnu3U6dWZg0oxm6GU8kEdA9A+BvSWKJO7sg3N0kq8=
13671367
knative.dev/hack v0.0.0-20240607132042-09143140a254/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
13681368
knative.dev/networking v0.0.0-20240611072033-3b8764c0bb4c h1:Q+DdJYzvhwAVWMQtP6mbEr5dNxpr+K9HAF9RqJmZefY=
13691369
knative.dev/networking v0.0.0-20240611072033-3b8764c0bb4c/go.mod h1:WhZLv94eOMDGHbdZiMrw6cnRfN3WEcFgpjUcV0A48pI=
13701370
knative.dev/pkg v0.0.0-20240626134149-3f6a546ac3a4 h1:slPKf3UKdBFZlz+hFy+KXzTgY9yOePLzRuEhKzgc5a4=
13711371
knative.dev/pkg v0.0.0-20240626134149-3f6a546ac3a4/go.mod h1:Wikg4u73T6vk9TctrxZt60VXzqmGEQIx0iKfk1+9o4c=
1372-
knative.dev/serving v0.41.1-0.20240628165250-af2c8999e7bb h1:yy59HYKCW33UArxZgwDgHi4PxX5E3EEYwVHfWi5nQBY=
1373-
knative.dev/serving v0.41.1-0.20240628165250-af2c8999e7bb/go.mod h1:7+wAf1rE/O2O+92Ft8Bfw3LnDirkg4c/+jKU3giMIoc=
1372+
knative.dev/serving v0.41.1-0.20240701085953-75f7393aaed4 h1:dTxEVyu43JWV6lsGCwkjdCIoQvCZF3mkrM2IlIWuc/g=
1373+
knative.dev/serving v0.41.1-0.20240701085953-75f7393aaed4/go.mod h1:7+wAf1rE/O2O+92Ft8Bfw3LnDirkg4c/+jKU3giMIoc=
13741374
nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
13751375
pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw=
13761376
pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=

vendor/knative.dev/eventing/pkg/apis/flows/v1/sequence_lifecycle.go

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,13 @@ import (
2828
duckv1 "knative.dev/pkg/apis/duck/v1"
2929
)
3030

31-
var sCondSet = apis.NewLivingConditionSet(SequenceConditionReady, SequenceConditionChannelsReady, SequenceConditionSubscriptionsReady, SequenceConditionAddressable)
31+
var sCondSet = apis.NewLivingConditionSet(
32+
SequenceConditionReady,
33+
SequenceConditionChannelsReady,
34+
SequenceConditionSubscriptionsReady,
35+
SequenceConditionAddressable,
36+
SequenceConditionEventPoliciesReady,
37+
)
3238

3339
const (
3440
// SequenceConditionReady has status True when all subconditions below have been set to True.
@@ -45,6 +51,10 @@ const (
4551
// SequenceConditionAddressable has status true when this Sequence meets
4652
// the Addressable contract and has a non-empty hostname.
4753
SequenceConditionAddressable apis.ConditionType = "Addressable"
54+
55+
// SequenceConditionEventPoliciesReady has status True when all the applying EventPolicies for this
56+
// Sequence are ready.
57+
SequenceConditionEventPoliciesReady apis.ConditionType = "EventPoliciesReady"
4858
)
4959

5060
// GetConditionSet retrieves the condition set for this resource. Implements the KRShaped interface.
@@ -189,6 +199,22 @@ func (ss *SequenceStatus) MarkAddressableNotReady(reason, messageFormat string,
189199
sCondSet.Manage(ss).MarkUnknown(SequenceConditionAddressable, reason, messageFormat, messageA...)
190200
}
191201

202+
func (ss *SequenceStatus) MarkEventPoliciesFailed(reason, messageFormat string, messageA ...interface{}) {
203+
sCondSet.Manage(ss).MarkFalse(SequenceConditionEventPoliciesReady, reason, messageFormat, messageA...)
204+
}
205+
206+
func (ss *SequenceStatus) MarkEventPoliciesUnknown(reason, messageFormat string, messageA ...interface{}) {
207+
sCondSet.Manage(ss).MarkUnknown(SequenceConditionEventPoliciesReady, reason, messageFormat, messageA...)
208+
}
209+
210+
func (ss *SequenceStatus) MarkEventPoliciesTrue() {
211+
sCondSet.Manage(ss).MarkTrue(SequenceConditionEventPoliciesReady)
212+
}
213+
214+
func (ss *SequenceStatus) MarkEventPoliciesTrueWithReason(reason, messageFormat string, messageA ...interface{}) {
215+
sCondSet.Manage(ss).MarkTrueWithReason(SequenceConditionEventPoliciesReady, reason, messageFormat, messageA...)
216+
}
217+
192218
func (ss *SequenceStatus) setAddress(address *duckv1.Addressable) {
193219
if address == nil || address.URL == nil {
194220
ss.Address = duckv1.Addressable{}

vendor/knative.dev/eventing/pkg/reconciler/testing/v1/sequence.go

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ import (
2121
"time"
2222

2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
24+
eventingduckv1 "knative.dev/eventing/pkg/apis/duck/v1"
25+
"knative.dev/eventing/pkg/apis/eventing/v1alpha1"
26+
"knative.dev/eventing/pkg/apis/feature"
2427
flowsv1 "knative.dev/eventing/pkg/apis/flows/v1"
2528
messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1"
2629
duckv1 "knative.dev/pkg/apis/duck/v1"
@@ -113,3 +116,38 @@ func WithSequenceAddressableNotReady(reason, message string) SequenceOption {
113116
p.Status.MarkAddressableNotReady(reason, message)
114117
}
115118
}
119+
120+
func WithSequenceEventPoliciesReady() SequenceOption {
121+
return func(p *flowsv1.Sequence) {
122+
p.Status.MarkEventPoliciesTrue()
123+
}
124+
}
125+
126+
func WithSequenceEventPoliciesNotReady(reason, message string) SequenceOption {
127+
return func(p *flowsv1.Sequence) {
128+
p.Status.MarkEventPoliciesFailed(reason, message)
129+
}
130+
}
131+
132+
func WithSequenceEventPoliciesListed(policyNames ...string) SequenceOption {
133+
return func(p *flowsv1.Sequence) {
134+
for _, name := range policyNames {
135+
p.Status.Policies = append(p.Status.Policies, eventingduckv1.AppliedEventPolicyRef{
136+
APIVersion: v1alpha1.SchemeGroupVersion.String(),
137+
Name: name,
138+
})
139+
}
140+
}
141+
}
142+
143+
func WithSequenceEventPoliciesReadyBecauseOIDCDisabled() SequenceOption {
144+
return func(p *flowsv1.Sequence) {
145+
p.Status.MarkEventPoliciesTrueWithReason("OIDCDisabled", "Feature %q must be enabled to support Authorization", feature.OIDCAuthentication)
146+
}
147+
}
148+
149+
func WithSequenceEventPoliciesReadyBecauseNoPolicyAndOIDCEnabled() SequenceOption {
150+
return func(p *flowsv1.Sequence) {
151+
p.Status.MarkEventPoliciesTrueWithReason("DefaultAuthorizationMode", "Default authz mode is %q", feature.AuthorizationAllowSameNamespace)
152+
}
153+
}

vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1323,7 +1323,7 @@ k8s.io/utils/trace
13231323
## explicit; go 1.22
13241324
knative.dev/caching/pkg/apis/caching
13251325
knative.dev/caching/pkg/apis/caching/v1alpha1
1326-
# knative.dev/eventing v0.41.1-0.20240628173119-3b1bfb4674ca
1326+
# knative.dev/eventing v0.41.1-0.20240701131713-96c30bd21612
13271327
## explicit; go 1.22
13281328
knative.dev/eventing/pkg/apis/config
13291329
knative.dev/eventing/pkg/apis/duck
@@ -1533,7 +1533,7 @@ knative.dev/pkg/webhook
15331533
knative.dev/pkg/webhook/certificates
15341534
knative.dev/pkg/webhook/certificates/resources
15351535
knative.dev/pkg/webhook/resourcesemantics/conversion
1536-
# knative.dev/serving v0.41.1-0.20240628165250-af2c8999e7bb
1536+
# knative.dev/serving v0.41.1-0.20240701085953-75f7393aaed4
15371537
## explicit; go 1.22
15381538
knative.dev/serving/pkg/apis/autoscaling
15391539
knative.dev/serving/pkg/apis/autoscaling/v1alpha1

0 commit comments

Comments
 (0)