Skip to content

Commit fa0d977

Browse files
upgrade to latest dependencies (#2001)
bumping knative.dev/eventing 51637df...ae049c8: > ae049c8 Jsonata Event transform e2e tests (# 8499) > c828898 Generic code for Certificates (# 8489) > 351898d fix: verify trigger is not ready before pingsource dependency exists (# 8494) > c651616 Add initial iteration of eventing-integration resources (# 8493) Signed-off-by: Knative Automation <[email protected]>
1 parent 56c9a3e commit fa0d977

File tree

5 files changed

+37
-8
lines changed

5 files changed

+37
-8
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
k8s.io/client-go v0.32.2
2222
k8s.io/code-generator v0.32.2
2323
knative.dev/caching v0.0.0-20250219013834-cd0465a8f31f
24-
knative.dev/eventing v0.44.1-0.20250220102449-51637df0bb15
24+
knative.dev/eventing v0.44.1-0.20250224164420-ae049c8b0ac4
2525
knative.dev/hack v0.0.0-20250219013704-306ce745e077
2626
knative.dev/pkg v0.0.0-20250219013713-9e265611c097
2727
knative.dev/reconciler-test v0.0.0-20250219013557-5ca0bd4fcad5

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1408,8 +1408,8 @@ k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJ
14081408
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
14091409
knative.dev/caching v0.0.0-20250219013834-cd0465a8f31f h1:FDSUQlZSeHiLRoy5ZlRfxeF+WrOVyw96FhbXBel+3Ag=
14101410
knative.dev/caching v0.0.0-20250219013834-cd0465a8f31f/go.mod h1:iu5bpefRxe1sIK2CkEJklOsHqJsG2eEqMbb4SvOmCVI=
1411-
knative.dev/eventing v0.44.1-0.20250220102449-51637df0bb15 h1:QJ/I6zMV7hYC6vRU9X112cxSAbs+8po8mPpBQEGaAOM=
1412-
knative.dev/eventing v0.44.1-0.20250220102449-51637df0bb15/go.mod h1:i4PjN2rb0QmMyixcu2t7We+m7IUElw/usr6EuKAP9+g=
1411+
knative.dev/eventing v0.44.1-0.20250224164420-ae049c8b0ac4 h1:5mZhIKeakMpa6f23DQMJiVt4OAnGJBvkFt/F+UM9eBs=
1412+
knative.dev/eventing v0.44.1-0.20250224164420-ae049c8b0ac4/go.mod h1:i4PjN2rb0QmMyixcu2t7We+m7IUElw/usr6EuKAP9+g=
14131413
knative.dev/hack v0.0.0-20250219013704-306ce745e077 h1:kcYrHAI+x7KHChjFfJ37Sq5QNAIwQExRor+g6Rbg1K0=
14141414
knative.dev/hack v0.0.0-20250219013704-306ce745e077/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
14151415
knative.dev/networking v0.0.0-20250217154350-2cde4327c6c8 h1:3KfFspdja6AYVQu/XZy1ZQLE+ZGLMtDOaqCNmitQRH4=

vendor/knative.dev/eventing/test/rekt/features/trigger/feature.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333

3434
"knative.dev/reconciler-test/pkg/eventshub/assert"
3535

36-
eventingv1 "knative.dev/eventing/pkg/apis/duck/v1"
36+
eventingduckv1 "knative.dev/eventing/pkg/apis/duck/v1"
3737
"knative.dev/eventing/pkg/eventingtls/eventingtlstesting"
3838
"knative.dev/eventing/test/rekt/features/featureflags"
3939
"knative.dev/eventing/test/rekt/resources/broker"
@@ -67,10 +67,15 @@ func TriggerDependencyAnnotation() *feature.Feature {
6767
trigger.WithAnnotations(annotations),
6868
trigger.WithBrokerName(brokerName),
6969
}
70-
7170
// Install the trigger
7271
f.Setup("install trigger", trigger.Install(triggerName, cfg...))
7372

73+
// trigger is not ready since the pingsource dependency is not installed yet
74+
f.Setup("trigger is not ready before pingsource dependency exists", trigger.IsNotReady(triggerName))
75+
76+
// verify that the trigger has the DependencyDoesNotExist condition
77+
f.Setup("trigger has DependencyDoesNotExist condition", trigger.DependencyDoesNotExist(triggerName))
78+
7479
// trigger won't go ready until after the pingsource exists, because of the dependency annotation
7580
f.Requirement("trigger goes ready", trigger.IsReady(triggerName))
7681

@@ -167,7 +172,7 @@ func TriggerWithTLSSubscriber() *feature.Feature {
167172
dls := service.AsDestinationRef(dlsName)
168173
dls.CACerts = eventshub.GetCaCerts(ctx)
169174

170-
linear := eventingv1.BackoffPolicyLinear
175+
linear := eventingduckv1.BackoffPolicyLinear
171176
trigger.Install(dlsTriggerName, trigger.WithBrokerName(brokerName),
172177
trigger.WithRetry(2, &linear, pointer.String("PT1S")),
173178
trigger.WithDeadLetterSinkFromDestination(dls),
@@ -245,7 +250,7 @@ func TriggerWithTLSSubscriberTrustBundle() *feature.Feature {
245250
CACerts: nil, // CA certs are in the trust-bundle
246251
}
247252

248-
linear := eventingv1.BackoffPolicyLinear
253+
linear := eventingduckv1.BackoffPolicyLinear
249254
trigger.Install(dlsTriggerName, trigger.WithBrokerName(brokerName),
250255
trigger.WithRetry(2, &linear, pointer.String("PT1S")),
251256
trigger.WithDeadLetterSinkFromDestination(dls),

vendor/knative.dev/eventing/test/rekt/resources/trigger/trigger.go

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525

2626
"k8s.io/apimachinery/pkg/runtime/schema"
2727
duckv1 "knative.dev/pkg/apis/duck/v1"
28+
"knative.dev/reconciler-test/pkg/environment"
2829
"knative.dev/reconciler-test/pkg/feature"
2930
"knative.dev/reconciler-test/pkg/k8s"
3031
"knative.dev/reconciler-test/pkg/manifest"
@@ -219,6 +220,29 @@ func IsReady(name string, timing ...time.Duration) feature.StepFn {
219220
return k8s.IsReady(GVR(), name, timing...)
220221
}
221222

223+
// IsNotReady tests to see if a Trigger is not ready within the time given.
224+
func IsNotReady(name string, timing ...time.Duration) feature.StepFn {
225+
return k8s.IsNotReady(GVR(), name, timing...)
226+
}
227+
228+
// DependencyDoesNotExist tests to see if a Trigger meets the DependencyDoesNotExist condition within the time given.
229+
func DependencyDoesNotExist(name string, timing ...time.Duration) feature.StepFn {
230+
return func(ctx context.Context, t feature.T) {
231+
err := k8s.WaitForResourceCondition(ctx, t, environment.FromContext(ctx).Namespace(), name, GVR(),
232+
func(obj duckv1.KResource) bool {
233+
condition := obj.Status.GetCondition(eventingv1.TriggerConditionDependency)
234+
if condition != nil && condition.Reason == "DependencyDoesNotExist" {
235+
return true
236+
}
237+
return false
238+
}, timing...)
239+
240+
if err != nil {
241+
t.Error("trigger did not meet DependencyDoesNotExist condition", err)
242+
}
243+
}
244+
}
245+
222246
func WithNewFilters(filters []eventingv1.SubscriptionsAPIFilter) manifest.CfgFn {
223247
jsonBytes, err := json.Marshal(filters)
224248
if err != nil {

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1421,7 +1421,7 @@ k8s.io/utils/trace
14211421
## explicit; go 1.23.0
14221422
knative.dev/caching/pkg/apis/caching
14231423
knative.dev/caching/pkg/apis/caching/v1alpha1
1424-
# knative.dev/eventing v0.44.1-0.20250220102449-51637df0bb15
1424+
# knative.dev/eventing v0.44.1-0.20250224164420-ae049c8b0ac4
14251425
## explicit; go 1.23.0
14261426
knative.dev/eventing/cmd/heartbeats
14271427
knative.dev/eventing/pkg/apis

0 commit comments

Comments
 (0)