Skip to content

Commit d338ac1

Browse files
upgrade to latest dependencies
bumping knative.dev/hack 306ce74...742e1e5: > 742e1e5 Deprecate knative.dev/hack/schema (# 418) bumping knative.dev/eventing 4fd274a...da4377a: > 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) Signed-off-by: Knative Automation <[email protected]>
1 parent f415df3 commit d338ac1

File tree

4 files changed

+47
-8
lines changed

4 files changed

+47
-8
lines changed

go.mod

+2-2
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.20250314135139-da4377a6dab0
24+
knative.dev/hack v0.0.0-20250314171439-742e1e50da78
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

go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -836,10 +836,10 @@ k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 h1:hcha5B1kVACrLujCKLbr8X
836836
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7/go.mod h1:GewRfANuJ70iYzvn+i4lezLDAFzvjxZYK1gn1lWcfas=
837837
k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
838838
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
839-
knative.dev/eventing v0.44.1-0.20250312062536-4fd274af684d h1:6z9vNkUHm4kEe5k3lv9kaeFU7EONBoyUeCJ6fP9FB6I=
840-
knative.dev/eventing v0.44.1-0.20250312062536-4fd274af684d/go.mod h1:XGwnQsnbfErPGKc1IAKnfo5yIc8iB7ahg3fbk3PJDo8=
841-
knative.dev/hack v0.0.0-20250219013704-306ce745e077 h1:kcYrHAI+x7KHChjFfJ37Sq5QNAIwQExRor+g6Rbg1K0=
842-
knative.dev/hack v0.0.0-20250219013704-306ce745e077/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
839+
knative.dev/eventing v0.44.1-0.20250314135139-da4377a6dab0 h1:rscpd9jxYVZ3y5ETEP08EIXAg19BdzV+kh0wnU1NTok=
840+
knative.dev/eventing v0.44.1-0.20250314135139-da4377a6dab0/go.mod h1:CAOHAx7K8nZINP5qHbOJqByNiPZcPtSKKUfpQ4pyWfc=
841+
knative.dev/hack v0.0.0-20250314171439-742e1e50da78 h1:K3cI9khmEm63uwnm2S6ZFq1r/nsJFDXtUHqPnyKdnCM=
842+
knative.dev/hack v0.0.0-20250314171439-742e1e50da78/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
843843
knative.dev/pkg v0.0.0-20250312035536-b7bbf4be5dbd h1:KXG6bACwjKSZcT0JxyQDVYLcDPSip+7l6sVULeITi7k=
844844
knative.dev/pkg v0.0.0-20250312035536-b7bbf4be5dbd/go.mod h1:OuszA8pcsXmO+Pp4QCtD10ph6tjRPFN+LrF/XgAMDb8=
845845
knative.dev/reconciler-test v0.0.0-20250219013557-5ca0bd4fcad5 h1:1j57zjXSniTDmw9p55y6GRQ5FbBRthLm9ytCkiRZNxg=

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() {

vendor/modules.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -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.20250314135139-da4377a6dab0
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-20250314171439-742e1e50da78
12531253
## explicit; go 1.21
12541254
knative.dev/hack
12551255
# knative.dev/pkg v0.0.0-20250312035536-b7bbf4be5dbd

0 commit comments

Comments
 (0)