Skip to content

Commit 9686233

Browse files
upgrade to latest dependencies
bumping knative.dev/hack 306ce74...8f599b7: > 8f599b7 Skip whitespace changes in codegen (# 420) > 742e1e5 Deprecate knative.dev/hack/schema (# 418) bumping knative.dev/eventing 4fd274a...8027fd3: > 8027fd3 Remove unnecessary cert-manager generated code (# 8539) > a5858a5 Fix EventTransform with TLS Sink test (# 8537) > 897d1d1 [main] Upgrade to latest dependencies (# 8533) > 609a064 Prevent knative-nightly integrations image references from being released (# 8521) > 8ac630d Use more readable ENV_VAR names for Camel (# 8531) > 5daaa6c Allow setting finalizers for EventTransform reconciler (# 8534) > 433aa64 [Automated] Update eventing-eventing-integrations nightly (# 8530) > 4080fcf Try to bump to latest of CE Conformance (# 8532) > c022af7 Fixing the way we render custom camel tags on go structs (# 8528) > da4377a Propagate Cert-Manager Certificate status to the one from the IntegrationSink (# 8527) > 1fd0d89 [main] Upgrade to latest dependencies (# 8523) > d6cc879 Skip EventTransform TLS tests when Istio is enabled (# 8525) bumping github.com/cloudevents/conformance eddc279...7a8ee0a: > 7a8ee0a Merge pull request # 27 from n3wscott/ce-diff > 3302931 Update README.md > c4e318c better findby, split on comma, add find tracker > 4e495fa Merge pull request # 25 from n3wscott/ce-diff > 312bd2c add diff to readme > 08d5cb1 Merge pull request # 24 from n3wscott/history-2 > 981936c fix data race > c59d2d6 Merge pull request # 23 from n3wscott/history > fbd3e52 adding non-consuming buffer option, and a blocking wait call on history > 9ef4496 update actions to use go 1.16 and 1.17 > aad1e08 Merge pull request # 22 from n3wscott/add-headers > fbdf101 Adding history to the listen command to fetch back events > cd561e9 add cloudevent diff command > c12a4f9 Merge pull request # 21 from n3wscott/invert-flags > 32c38c5 Adding copyright header to all source > 1a5a83c invert setting flags on commands Signed-off-by: Knative Automation <[email protected]>
1 parent 64360a1 commit 9686233

File tree

12 files changed

+437
-61
lines changed

12 files changed

+437
-61
lines changed

Diff for: go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ require (
2020
k8s.io/client-go v0.32.2
2121
k8s.io/code-generator v0.32.2
2222
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7
23-
knative.dev/eventing v0.44.1-0.20250312062536-4fd274af684d
24-
knative.dev/hack v0.0.0-20250219013704-306ce745e077
23+
knative.dev/eventing v0.44.1-0.20250321122216-8027fd3e8ba4
24+
knative.dev/hack v0.0.0-20250318155814-8f599b7a828c
2525
knative.dev/pkg v0.0.0-20250312035536-b7bbf4be5dbd
2626
knative.dev/reconciler-test v0.0.0-20250219013557-5ca0bd4fcad5
2727
sigs.k8s.io/controller-runtime v0.19.0
@@ -44,7 +44,7 @@ require (
4444
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
4545
github.com/cert-manager/cert-manager v1.16.3 // indirect
4646
github.com/cespare/xxhash/v2 v2.3.0 // indirect
47-
github.com/cloudevents/conformance v0.2.0 // indirect
47+
github.com/cloudevents/conformance v0.4.1 // indirect
4848
github.com/cloudevents/sdk-go/sql/v2 v2.15.2 // indirect
4949
github.com/coreos/go-oidc/v3 v3.9.0 // indirect
5050
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect

Diff for: go.sum

+308-24
Large diffs are not rendered by default.

Diff for: vendor/github.com/cloudevents/conformance/pkg/event/event.go

+35-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: vendor/github.com/cloudevents/conformance/pkg/event/read.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: vendor/github.com/cloudevents/conformance/pkg/event/write.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: vendor/github.com/cloudevents/conformance/pkg/http/http.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: vendor/github.com/cloudevents/conformance/pkg/http/raw.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: vendor/knative.dev/eventing/pkg/apis/common/integration/v1alpha1/aws.go

+25-25
Original file line numberDiff line numberDiff line change
@@ -33,33 +33,33 @@ type AWSCommon struct {
3333

3434
type AWSS3 struct {
3535
AWSCommon `json:",inline"` // Embeds AWSCommon to inherit its fields in JSON
36-
Arn string `json:"arn,omitempty" camel:"CAMEL_KAMELET_AWS_S3_SOURCE_BUCKETNAMEORARN"` // S3 ARN
37-
DeleteAfterRead bool `json:"deleteAfterRead" default:"true"` // Auto-delete objects after reading
38-
MoveAfterRead bool `json:"moveAfterRead" default:"false"` // Move objects after reading
39-
DestinationBucket string `json:"destinationBucket,omitempty"` // Destination bucket for moved objects
40-
DestinationBucketPrefix string `json:"destinationBucketPrefix,omitempty"` // Prefix for moved objects
41-
DestinationBucketSuffix string `json:"destinationBucketSuffix,omitempty"` // Suffix for moved objects
42-
AutoCreateBucket bool `json:"autoCreateBucket" default:"false"` // Auto-create S3 bucket
43-
Prefix string `json:"prefix,omitempty"` // S3 bucket prefix for search
44-
IgnoreBody bool `json:"ignoreBody" default:"false"` // Ignore object body
45-
ForcePathStyle bool `json:"forcePathStyle" default:"false"` // Force path style for bucket access
46-
Delay int `json:"delay" default:"500"` // Delay between polls in milliseconds
47-
MaxMessagesPerPoll int `json:"maxMessagesPerPoll" default:"10"` // Max messages to poll per request
36+
Arn string `json:"arn,omitempty" camel:"BUCKET_NAME_OR_ARN"` // S3 ARN
37+
DeleteAfterRead bool `json:"deleteAfterRead" default:"true"` // Auto-delete objects after reading
38+
MoveAfterRead bool `json:"moveAfterRead" default:"false"` // Move objects after reading
39+
DestinationBucket string `json:"destinationBucket,omitempty"` // Destination bucket for moved objects
40+
DestinationBucketPrefix string `json:"destinationBucketPrefix,omitempty"` // Prefix for moved objects
41+
DestinationBucketSuffix string `json:"destinationBucketSuffix,omitempty"` // Suffix for moved objects
42+
AutoCreateBucket bool `json:"autoCreateBucket" default:"false"` // Auto-create S3 bucket
43+
Prefix string `json:"prefix,omitempty"` // S3 bucket prefix for search
44+
IgnoreBody bool `json:"ignoreBody" default:"false"` // Ignore object body
45+
ForcePathStyle bool `json:"forcePathStyle" default:"false"` // Force path style for bucket access
46+
Delay int `json:"delay" default:"500"` // Delay between polls in milliseconds
47+
MaxMessagesPerPoll int `json:"maxMessagesPerPoll" default:"10"` // Max messages to poll per request
4848
}
4949

5050
type AWSSQS struct {
5151
AWSCommon `json:",inline"` // Embeds AWSCommon to inherit its fields in JSON
52-
Arn string `json:"arn,omitempty" camel:"CAMEL_KAMELET_AWS_SQS_SOURCE_QUEUENAMEORARN"` // SQS ARN
53-
DeleteAfterRead bool `json:"deleteAfterRead" default:"true"` // Auto-delete messages after reading
54-
AutoCreateQueue bool `json:"autoCreateQueue" default:"false"` // Auto-create SQS queue
55-
Host string `json:"host" camel:"CAMEL_KAMELET_AWS_SQS_SOURCE_AMAZONAWSHOST" default:"amazonaws.com"` // AWS host
56-
Protocol string `json:"protocol" default:"https"` // Communication protocol (http/https)
57-
QueueURL string `json:"queueURL,omitempty"` // Full SQS queue URL
58-
Greedy bool `json:"greedy" default:"false"` // Greedy scheduler
59-
Delay int `json:"delay" default:"500"` // Delay between polls in milliseconds
60-
MaxMessagesPerPoll int `json:"maxMessagesPerPoll" default:"1"` // Max messages to return (1-10)
61-
WaitTimeSeconds int `json:"waitTimeSeconds,omitempty"` // Wait time for messages
62-
VisibilityTimeout int `json:"visibilityTimeout,omitempty"` // Visibility timeout in seconds
52+
Arn string `json:"arn,omitempty" camel:"QUEUE_NAME_OR_ARN"` // SQS ARN
53+
DeleteAfterRead bool `json:"deleteAfterRead" default:"true"` // Auto-delete messages after reading
54+
AutoCreateQueue bool `json:"autoCreateQueue" default:"false"` // Auto-create SQS queue
55+
Host string `json:"host" camel:"AMAZONAWSHOST" default:"amazonaws.com"` // AWS host
56+
Protocol string `json:"protocol" default:"https"` // Communication protocol (http/https)
57+
QueueURL string `json:"queueURL,omitempty"` // Full SQS queue URL
58+
Greedy bool `json:"greedy" default:"false"` // Greedy scheduler
59+
Delay int `json:"delay" default:"500"` // Delay between polls in milliseconds
60+
MaxMessagesPerPoll int `json:"maxMessagesPerPoll" default:"1"` // Max messages to return (1-10)
61+
WaitTimeSeconds int `json:"waitTimeSeconds,omitempty"` // Wait time for messages
62+
VisibilityTimeout int `json:"visibilityTimeout,omitempty"` // Visibility timeout in seconds
6363
}
6464

6565
type AWSDDBStreams struct {
@@ -71,6 +71,6 @@ type AWSDDBStreams struct {
7171

7272
type AWSSNS struct {
7373
AWSCommon `json:",inline"` // Embeds AWSCommon to inherit its fields in JSON
74-
Arn string `json:"arn,omitempty" camel:"CAMEL_KAMELET_AWS_SNS_SINK_TOPICNAMEORARN"` // SNS ARN
75-
AutoCreateTopic bool `json:"autoCreateTopic" default:"false"` // Auto-create SNS topic
74+
Arn string `json:"arn,omitempty" camel:"TOPIC_NAME_OR_ARN"` // SNS ARN
75+
AutoCreateTopic bool `json:"autoCreateTopic" default:"false"` // Auto-create SNS topic
7676
}

Diff for: vendor/knative.dev/eventing/pkg/apis/sinks/v1alpha1/integration_sink_lifecycle.go

+39
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ limitations under the License.
1717
package v1alpha1
1818

1919
import (
20+
cmv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
21+
cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
2022
appsv1 "k8s.io/api/apps/v1"
2123
corev1 "k8s.io/api/core/v1"
2224
"knative.dev/pkg/apis"
@@ -35,6 +37,12 @@ const (
3537
// IntegrationSinkConditionEventPoliciesReady has status True when all the applying EventPolicies for this
3638
// IntegrationSink are ready.
3739
IntegrationSinkConditionEventPoliciesReady apis.ConditionType = "EventPoliciesReady"
40+
41+
// IntegrationSinkConditionCertificateReady has status True when the IntegrationSink's certificate is ready.
42+
IntegrationSinkConditionCertificateReady apis.ConditionType = "CertificateReady"
43+
44+
// Certificate related condition reasons
45+
IntegrationSinkCertificateNotReady string = "CertificateNotReady"
3846
)
3947

4048
var IntegrationSinkCondSet = apis.NewLivingConditionSet(
@@ -112,6 +120,37 @@ func (s *IntegrationSinkStatus) PropagateDeploymentStatus(d *appsv1.DeploymentSt
112120
}
113121
}
114122

123+
func (s *IntegrationSinkStatus) PropagateCertificateStatus(cs cmv1.CertificateStatus) bool {
124+
var topLevel *cmv1.CertificateCondition
125+
for _, cond := range cs.Conditions {
126+
if cond.Type == cmv1.CertificateConditionReady {
127+
topLevel = &cond
128+
break
129+
}
130+
}
131+
132+
if topLevel == nil {
133+
IntegrationSinkCondSet.Manage(s).MarkUnknown(IntegrationSinkConditionCertificateReady,
134+
IntegrationSinkCertificateNotReady, "Certificate is progressing")
135+
return false
136+
}
137+
138+
if topLevel.Status == cmmeta.ConditionUnknown {
139+
IntegrationSinkCondSet.Manage(s).MarkUnknown(IntegrationSinkConditionCertificateReady,
140+
IntegrationSinkCertificateNotReady, "Certificate is progressing, "+topLevel.Reason+" Message: "+topLevel.Message)
141+
return false
142+
}
143+
144+
if topLevel.Status == cmmeta.ConditionFalse {
145+
IntegrationSinkCondSet.Manage(s).MarkFalse(IntegrationSinkConditionCertificateReady,
146+
IntegrationSinkCertificateNotReady, "Certificate is not ready, "+topLevel.Reason+" Message: "+topLevel.Message)
147+
return false
148+
}
149+
150+
IntegrationSinkCondSet.Manage(s).MarkTrue(IntegrationSinkConditionCertificateReady)
151+
return true
152+
}
153+
115154
func (s *IntegrationSinkStatus) SetAddress(address *duckv1.Addressable) {
116155
s.Address = address
117156
if address == nil || address.URL.IsEmpty() {

Diff for: vendor/knative.dev/hack/boilerplate.go.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
66
You may obtain a copy of the License at
77

8-
http://www.apache.org/licenses/LICENSE-2.0
8+
http://www.apache.org/licenses/LICENSE-2.0
99

1010
Unless required by applicable law or agreed to in writing, software
1111
distributed under the License is distributed on an "AS IS" BASIS,

Diff for: vendor/knative.dev/hack/codegen-library.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ function restore-changes-if-its-copyright-year-only() {
138138
git diff --name-only > "$difflist"
139139
while read -r file; do
140140
# check if the file contains just the change in the boilerplate year
141-
if [ "$(LANG=C git diff --exit-code --shortstat -- "$file")" = ' 1 file changed, 1 insertion(+), 1 deletion(-)' ] && \
142-
[[ "$(git diff --exit-code -U1 -- "$file" | grep -Ec '^[+-]\s*[*#]?\s*Copyright 2[0-9]{3}')" -eq 2 ]]; then
141+
if [ "$(LANG=C git diff --ignore-space-change --exit-code --shortstat -- "$file")" = ' 1 file changed, 1 insertion(+), 1 deletion(-)' ] && \
142+
[[ "$(git diff --ignore-space-change --exit-code -U1 -- "$file" | grep -Ec '^[+-]\s*[*#]?\s*Copyright 2[0-9]{3}')" -eq 2 ]]; then
143143
# restore changes to that file
144144
git checkout -- "$file"
145145
fi

Diff for: vendor/modules.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ github.com/cert-manager/cert-manager/pkg/client/listers/certmanager/v1
4646
# github.com/cespare/xxhash/v2 v2.3.0
4747
## explicit; go 1.11
4848
github.com/cespare/xxhash/v2
49-
# github.com/cloudevents/conformance v0.2.0
50-
## explicit; go 1.14
49+
# github.com/cloudevents/conformance v0.4.1
50+
## explicit; go 1.16
5151
github.com/cloudevents/conformance/pkg/event
5252
github.com/cloudevents/conformance/pkg/http
5353
# github.com/cloudevents/sdk-go/observability/opencensus/v2 v2.15.2
@@ -1114,7 +1114,7 @@ k8s.io/utils/net
11141114
k8s.io/utils/pointer
11151115
k8s.io/utils/ptr
11161116
k8s.io/utils/trace
1117-
# knative.dev/eventing v0.44.1-0.20250312062536-4fd274af684d
1117+
# knative.dev/eventing v0.44.1-0.20250321122216-8027fd3e8ba4
11181118
## explicit; go 1.23.0
11191119
knative.dev/eventing/cmd/heartbeats
11201120
knative.dev/eventing/pkg/adapter/v2
@@ -1249,7 +1249,7 @@ knative.dev/eventing/test/rekt/resources/trigger
12491249
knative.dev/eventing/test/test_images
12501250
knative.dev/eventing/test/test_images/event-sender
12511251
knative.dev/eventing/test/test_images/print
1252-
# knative.dev/hack v0.0.0-20250219013704-306ce745e077
1252+
# knative.dev/hack v0.0.0-20250318155814-8f599b7a828c
12531253
## explicit; go 1.21
12541254
knative.dev/hack
12551255
# knative.dev/pkg v0.0.0-20250312035536-b7bbf4be5dbd

0 commit comments

Comments
 (0)