From d9542809942116796c970c28669dea0cc1a0b988 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Tue, 6 Jun 2023 13:25:17 +0000 Subject: [PATCH] upgrade to latest dependencies bumping knative.dev/eventing df08b49...57d78e0:%0A > 57d78e0 [main] Update community files (# 7004)%0A > dfb2243 Support TLS in Trigger and Channel reconciler (# 6988)%0Abumping knative.dev/serving 349b2d6...c95f17b:%0A > c95f17b Update community files (# 14067)%0A > bf48e64 Remove deprecated internalEncryption dependency (# 14064)%0A > 6b87d67 Update net-istio nightly (# 14065)%0A > fbecf34 refactor throttler_test.go (# 14055)%0Abumping knative.dev/pkg 5671699...94b81fc:%0A > 94b81fc Update community files (# 2752)%0Abumping knative.dev/client-pkg 83c91f4...b93ceb0:%0A > b93ceb0 Update community files (# 105)%0Abumping knative.dev/hack 5b7907f...a861c8e:%0A > a861c8e Update community files (# 294) Signed-off-by: Knative Automation --- go.mod | 10 ++++----- go.sum | 20 ++++++++--------- .../pkg/apis/duck/v1/delivery_types.go | 22 +++++++++++++++++++ .../pkg/apis/duck/v1/zz_generated.deepcopy.go | 5 +++++ .../pkg/apis/eventing/v1/broker_lifecycle.go | 10 +++++---- .../pkg/apis/eventing/v1/test_helper.go | 7 +++--- .../apis/messaging/v1/channel_lifecycle.go | 11 +++++----- .../v1/in_memory_channel_lifecycle.go | 18 ++++++++------- vendor/modules.txt | 10 ++++----- 9 files changed, 73 insertions(+), 40 deletions(-) diff --git a/go.mod b/go.mod index 46d2ee66a6..b5cbf7e088 100644 --- a/go.mod +++ b/go.mod @@ -48,11 +48,11 @@ require ( k8s.io/api v0.26.5 k8s.io/apimachinery v0.26.5 k8s.io/client-go v1.5.2 - knative.dev/client-pkg v0.0.0-20230524014834-83c91f47f64f - knative.dev/eventing v0.37.1-0.20230601130337-df08b49b7477 - knative.dev/hack v0.0.0-20230530201435-5b7907fbe350 - knative.dev/pkg v0.0.0-20230531073936-5671699f23d9 - knative.dev/serving v0.37.1-0.20230603021539-349b2d61b0e8 + knative.dev/client-pkg v0.0.0-20230606015531-b93ceb0dd4f1 + knative.dev/eventing v0.37.1-0.20230606013829-57d78e060db6 + knative.dev/hack v0.0.0-20230606014732-a861c8e9da08 + knative.dev/pkg v0.0.0-20230606013829-94b81fcefb58 + knative.dev/serving v0.37.1-0.20230606023926-c95f17bd0631 ) require ( diff --git a/go.sum b/go.sum index ce4c6c1f1c..d02cce5633 100644 --- a/go.sum +++ b/go.sum @@ -2530,18 +2530,18 @@ k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY= k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -knative.dev/client-pkg v0.0.0-20230524014834-83c91f47f64f h1:hlLa78gxH9gkgLC/fmsnh9+x/8zCpPS40q0c8K065aQ= -knative.dev/client-pkg v0.0.0-20230524014834-83c91f47f64f/go.mod h1:oYnznlTBCj/bVEHo5vUSM/VS3oDFNJKDmH5+k1aC9/8= -knative.dev/eventing v0.37.1-0.20230601130337-df08b49b7477 h1:yTdDWJMFVroD2EGFkXEy5MueqafC/Px25zh50W0B8+E= -knative.dev/eventing v0.37.1-0.20230601130337-df08b49b7477/go.mod h1:00ZmViqsuF5wC8D9XvPGxfrT3Fb3JIaRvIzjk+3ppHo= -knative.dev/hack v0.0.0-20230530201435-5b7907fbe350 h1:lSV9uFTohrQd7i5OUhLnR87PwUHJplQKJSEiZgzP/VY= -knative.dev/hack v0.0.0-20230530201435-5b7907fbe350/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= +knative.dev/client-pkg v0.0.0-20230606015531-b93ceb0dd4f1 h1:w3sWOHo4wPxnJm6fVb2naf8gClO+elkj+eQkftu14F8= +knative.dev/client-pkg v0.0.0-20230606015531-b93ceb0dd4f1/go.mod h1:oYnznlTBCj/bVEHo5vUSM/VS3oDFNJKDmH5+k1aC9/8= +knative.dev/eventing v0.37.1-0.20230606013829-57d78e060db6 h1:Wsqpjkah8g9zu5Kn83pCZoXgoedfuPUuON+1suQggFQ= +knative.dev/eventing v0.37.1-0.20230606013829-57d78e060db6/go.mod h1:00ZmViqsuF5wC8D9XvPGxfrT3Fb3JIaRvIzjk+3ppHo= +knative.dev/hack v0.0.0-20230606014732-a861c8e9da08 h1:6DH2ktsj5KoKMAxPFmiDopMCVR1LzhxFNy3D/JCg7JE= +knative.dev/hack v0.0.0-20230606014732-a861c8e9da08/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= knative.dev/networking v0.0.0-20230524170920-2a2f7d2d7c60 h1:vErunGWa8pZNriLFaE4UbgdqNECKF7gJTYZE+DdOuOE= knative.dev/networking v0.0.0-20230524170920-2a2f7d2d7c60/go.mod h1:ieNknBTSWl441656hZF1JNHbTXbab138w8qPEwuwC0Q= -knative.dev/pkg v0.0.0-20230531073936-5671699f23d9 h1:xd7E2nuQ358cXR4jB7Y5+FH88Mm+SQTZty5pXa1TSfs= -knative.dev/pkg v0.0.0-20230531073936-5671699f23d9/go.mod h1:dqC6IrvyBE7E+oZocs5PkVhq1G59pDTA7r8U17EAKMk= -knative.dev/serving v0.37.1-0.20230603021539-349b2d61b0e8 h1:eTTTvVA2ACpnVf9yWT0+vHb0nssHTQIm3N7bh09hDIY= -knative.dev/serving v0.37.1-0.20230603021539-349b2d61b0e8/go.mod h1:GvvhPpKFkidelYBzmsiYQO2KubaQzNo/hJf67f5tKaA= +knative.dev/pkg v0.0.0-20230606013829-94b81fcefb58 h1:fsFj11vFdFkKk0TMJYnA7hus9FUhV1oMltRvbWCyQj8= +knative.dev/pkg v0.0.0-20230606013829-94b81fcefb58/go.mod h1:dqC6IrvyBE7E+oZocs5PkVhq1G59pDTA7r8U17EAKMk= +knative.dev/serving v0.37.1-0.20230606023926-c95f17bd0631 h1:ec94U+xe+1JqFa2yi/b9vBJVYRasjbZ046Cxyk213VQ= +knative.dev/serving v0.37.1-0.20230606023926-c95f17bd0631/go.mod h1:GvvhPpKFkidelYBzmsiYQO2KubaQzNo/hJf67f5tKaA= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= diff --git a/vendor/knative.dev/eventing/pkg/apis/duck/v1/delivery_types.go b/vendor/knative.dev/eventing/pkg/apis/duck/v1/delivery_types.go index 49c26ced5d..2c0306f200 100644 --- a/vendor/knative.dev/eventing/pkg/apis/duck/v1/delivery_types.go +++ b/vendor/knative.dev/eventing/pkg/apis/duck/v1/delivery_types.go @@ -154,4 +154,26 @@ type DeliveryStatus struct { // where failed events are sent to. // +optional DeadLetterSinkURI *apis.URL `json:"deadLetterSinkUri,omitempty"` + // DeadLetterSinkCACerts are Certification Authority (CA) certificates in PEM format + // according to https://www.rfc-editor.org/rfc/rfc7468. + // +optional + DeadLetterSinkCACerts *string `json:"deadLetterSinkCACerts,omitempty"` +} + +func (ds *DeliveryStatus) IsSet() bool { + return ds.DeadLetterSinkURI != nil +} + +func NewDeliveryStatusFromAddressable(addr *duckv1.Addressable) DeliveryStatus { + return DeliveryStatus{ + DeadLetterSinkURI: addr.URL, + DeadLetterSinkCACerts: addr.CACerts, + } +} + +func NewDestinationFromDeliveryStatus(status DeliveryStatus) duckv1.Destination { + return duckv1.Destination{ + URI: status.DeadLetterSinkURI, + CACerts: status.DeadLetterSinkCACerts, + } } diff --git a/vendor/knative.dev/eventing/pkg/apis/duck/v1/zz_generated.deepcopy.go b/vendor/knative.dev/eventing/pkg/apis/duck/v1/zz_generated.deepcopy.go index 8f024debf1..5dd4986c74 100644 --- a/vendor/knative.dev/eventing/pkg/apis/duck/v1/zz_generated.deepcopy.go +++ b/vendor/knative.dev/eventing/pkg/apis/duck/v1/zz_generated.deepcopy.go @@ -184,6 +184,11 @@ func (in *DeliveryStatus) DeepCopyInto(out *DeliveryStatus) { *out = new(apis.URL) (*in).DeepCopyInto(*out) } + if in.DeadLetterSinkCACerts != nil { + in, out := &in.DeadLetterSinkCACerts, &out.DeadLetterSinkCACerts + *out = new(string) + **out = **in + } return } diff --git a/vendor/knative.dev/eventing/pkg/apis/eventing/v1/broker_lifecycle.go b/vendor/knative.dev/eventing/pkg/apis/eventing/v1/broker_lifecycle.go index e85f12ed80..ebe569271e 100644 --- a/vendor/knative.dev/eventing/pkg/apis/eventing/v1/broker_lifecycle.go +++ b/vendor/knative.dev/eventing/pkg/apis/eventing/v1/broker_lifecycle.go @@ -21,6 +21,8 @@ import ( "knative.dev/pkg/apis" v1 "knative.dev/pkg/apis/duck/v1" + + eventingduck "knative.dev/eventing/pkg/apis/duck/v1" ) const ( @@ -104,17 +106,17 @@ func (bs *BrokerStatus) InitializeConditions() { bs.GetConditionSet().Manage(bs).InitializeConditions() } -func (bs *BrokerStatus) MarkDeadLetterSinkResolvedSucceeded(deadLetterSinkURI *apis.URL) { - bs.DeadLetterSinkURI = deadLetterSinkURI +func (bs *BrokerStatus) MarkDeadLetterSinkResolvedSucceeded(deadLetterSink eventingduck.DeliveryStatus) { + bs.DeliveryStatus = deadLetterSink bs.GetConditionSet().Manage(bs).MarkTrue(BrokerConditionDeadLetterSinkResolved) } func (bs *BrokerStatus) MarkDeadLetterSinkNotConfigured() { - bs.DeadLetterSinkURI = nil + bs.DeliveryStatus = eventingduck.DeliveryStatus{} bs.GetConditionSet().Manage(bs).MarkTrueWithReason(BrokerConditionDeadLetterSinkResolved, "DeadLetterSinkNotConfigured", "No dead letter sink is configured.") } func (bs *BrokerStatus) MarkDeadLetterSinkResolvedFailed(reason, messageFormat string, messageA ...interface{}) { - bs.DeadLetterSinkURI = nil + bs.DeliveryStatus = eventingduck.DeliveryStatus{} bs.GetConditionSet().Manage(bs).MarkFalse(BrokerConditionDeadLetterSinkResolved, reason, messageFormat, messageA...) } diff --git a/vendor/knative.dev/eventing/pkg/apis/eventing/v1/test_helper.go b/vendor/knative.dev/eventing/pkg/apis/eventing/v1/test_helper.go index 5082c9a2fc..80b2510009 100644 --- a/vendor/knative.dev/eventing/pkg/apis/eventing/v1/test_helper.go +++ b/vendor/knative.dev/eventing/pkg/apis/eventing/v1/test_helper.go @@ -19,10 +19,11 @@ package v1 import ( corev1 "k8s.io/api/core/v1" - eventingduckv1 "knative.dev/eventing/pkg/apis/duck/v1" - messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1" "knative.dev/pkg/apis" duckv1 "knative.dev/pkg/apis/duck/v1" + + eventingduckv1 "knative.dev/eventing/pkg/apis/duck/v1" + messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1" ) type testHelper struct{} @@ -61,7 +62,7 @@ func (t testHelper) ReadyBrokerStatus() *BrokerStatus { bs.PropagateTriggerChannelReadiness(t.ReadyChannelStatus()) bs.PropagateFilterAvailability(t.AvailableEndpoints()) bs.SetAddress(apis.HTTP("example.com")) - bs.MarkDeadLetterSinkResolvedSucceeded(nil) + bs.MarkDeadLetterSinkResolvedSucceeded(eventingduckv1.DeliveryStatus{}) return bs } diff --git a/vendor/knative.dev/eventing/pkg/apis/messaging/v1/channel_lifecycle.go b/vendor/knative.dev/eventing/pkg/apis/messaging/v1/channel_lifecycle.go index 40aa084b45..2936a1f194 100644 --- a/vendor/knative.dev/eventing/pkg/apis/messaging/v1/channel_lifecycle.go +++ b/vendor/knative.dev/eventing/pkg/apis/messaging/v1/channel_lifecycle.go @@ -19,9 +19,10 @@ package v1 import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime/schema" - eventingduck "knative.dev/eventing/pkg/apis/duck/v1" "knative.dev/pkg/apis" duckv1 "knative.dev/pkg/apis/duck/v1" + + eventingduck "knative.dev/eventing/pkg/apis/duck/v1" ) var chCondSet = apis.NewLivingConditionSet( @@ -131,17 +132,17 @@ func (cs *ChannelStatus) PropagateStatuses(chs *eventingduck.ChannelableStatus) cs.SubscribableStatus = chs.SubscribableStatus } -func (cs *ChannelStatus) MarkDeadLetterSinkResolvedSucceeded(deadLetterSinkURI *apis.URL) { - cs.DeliveryStatus.DeadLetterSinkURI = deadLetterSinkURI +func (cs *ChannelStatus) MarkDeadLetterSinkResolvedSucceeded(deadLetterSink eventingduck.DeliveryStatus) { + cs.DeliveryStatus = deadLetterSink chCondSet.Manage(cs).MarkTrue(ChannelConditionDeadLetterSinkResolved) } func (cs *ChannelStatus) MarkDeadLetterSinkNotConfigured() { - cs.DeadLetterSinkURI = nil + cs.DeliveryStatus = eventingduck.DeliveryStatus{} chCondSet.Manage(cs).MarkTrueWithReason(ChannelConditionDeadLetterSinkResolved, "DeadLetterSinkNotConfigured", "No dead letter sink is configured.") } func (cs *ChannelStatus) MarkDeadLetterSinkResolvedFailed(reason, messageFormat string, messageA ...interface{}) { - cs.DeadLetterSinkURI = nil + cs.DeliveryStatus = eventingduck.DeliveryStatus{} chCondSet.Manage(cs).MarkFalse(ChannelConditionDeadLetterSinkResolved, reason, messageFormat, messageA...) } diff --git a/vendor/knative.dev/eventing/pkg/apis/messaging/v1/in_memory_channel_lifecycle.go b/vendor/knative.dev/eventing/pkg/apis/messaging/v1/in_memory_channel_lifecycle.go index 1594a8a38f..6be9e29f33 100644 --- a/vendor/knative.dev/eventing/pkg/apis/messaging/v1/in_memory_channel_lifecycle.go +++ b/vendor/knative.dev/eventing/pkg/apis/messaging/v1/in_memory_channel_lifecycle.go @@ -23,6 +23,8 @@ import ( "k8s.io/utils/pointer" "knative.dev/pkg/apis" v1 "knative.dev/pkg/apis/duck/v1" + + eventingduck "knative.dev/eventing/pkg/apis/duck/v1" ) var imcCondSet = apis.NewLivingConditionSet( @@ -97,10 +99,10 @@ func (imcs *InMemoryChannelStatus) InitializeConditions() { imcCondSet.Manage(imcs).InitializeConditions() } -func (imcs *InMemoryChannelStatus) SetAddress(url *apis.URL) { - imcs.Address = &v1.Addressable{URL: url} - if url != nil { - imcs.Address.Name = pointer.String(url.Scheme) +func (imcs *InMemoryChannelStatus) SetAddress(addr *v1.Addressable) { + imcs.Address = addr + if addr != nil && addr.URL != nil { + imcs.Address.Name = pointer.String(addr.URL.Scheme) imcCondSet.Manage(imcs).MarkTrue(InMemoryChannelConditionAddressable) } else { imcCondSet.Manage(imcs).MarkFalse(InMemoryChannelConditionAddressable, "emptyHostname", "hostname is the empty string") @@ -166,17 +168,17 @@ func (imcs *InMemoryChannelStatus) MarkEndpointsTrue() { imcCondSet.Manage(imcs).MarkTrue(InMemoryChannelConditionEndpointsReady) } -func (imcs *InMemoryChannelStatus) MarkDeadLetterSinkResolvedSucceeded(deadLetterSinkURI *apis.URL) { - imcs.DeliveryStatus.DeadLetterSinkURI = deadLetterSinkURI +func (imcs *InMemoryChannelStatus) MarkDeadLetterSinkResolvedSucceeded(ds eventingduck.DeliveryStatus) { + imcs.DeliveryStatus = ds imcCondSet.Manage(imcs).MarkTrue(InMemoryChannelConditionDeadLetterSinkResolved) } func (imcs *InMemoryChannelStatus) MarkDeadLetterSinkNotConfigured() { - imcs.DeadLetterSinkURI = nil + imcs.DeliveryStatus = eventingduck.DeliveryStatus{} imcCondSet.Manage(imcs).MarkTrueWithReason(InMemoryChannelConditionDeadLetterSinkResolved, "DeadLetterSinkNotConfigured", "No dead letter sink is configured.") } func (imcs *InMemoryChannelStatus) MarkDeadLetterSinkResolvedFailed(reason, messageFormat string, messageA ...interface{}) { - imcs.DeadLetterSinkURI = nil + imcs.DeliveryStatus = eventingduck.DeliveryStatus{} imcCondSet.Manage(imcs).MarkFalse(InMemoryChannelConditionDeadLetterSinkResolved, reason, messageFormat, messageA...) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 02ccc46e2e..b3feb7486d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1693,7 +1693,7 @@ k8s.io/utils/net k8s.io/utils/pointer k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/client-pkg v0.0.0-20230524014834-83c91f47f64f +# knative.dev/client-pkg v0.0.0-20230606015531-b93ceb0dd4f1 ## explicit; go 1.18 knative.dev/client-pkg/pkg/apis/client knative.dev/client-pkg/pkg/apis/client/v1alpha1 @@ -1707,7 +1707,7 @@ knative.dev/client-pkg/pkg/serving/v1 knative.dev/client-pkg/pkg/util knative.dev/client-pkg/pkg/util/test knative.dev/client-pkg/pkg/wait -# knative.dev/eventing v0.37.1-0.20230601130337-df08b49b7477 +# knative.dev/eventing v0.37.1-0.20230606013829-57d78e060db6 ## explicit; go 1.19 knative.dev/eventing/pkg/apis/config knative.dev/eventing/pkg/apis/duck @@ -1728,7 +1728,7 @@ knative.dev/eventing/pkg/apis/sources/v1 knative.dev/eventing/pkg/apis/sources/v1beta2 knative.dev/eventing/pkg/client/clientset/versioned/scheme knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1 -# knative.dev/hack v0.0.0-20230530201435-5b7907fbe350 +# knative.dev/hack v0.0.0-20230606014732-a861c8e9da08 ## explicit; go 1.18 knative.dev/hack # knative.dev/networking v0.0.0-20230524170920-2a2f7d2d7c60 @@ -1743,7 +1743,7 @@ knative.dev/networking/pkg/http/probe knative.dev/networking/pkg/http/proxy knative.dev/networking/pkg/http/stats knative.dev/networking/pkg/k8s -# knative.dev/pkg v0.0.0-20230531073936-5671699f23d9 +# knative.dev/pkg v0.0.0-20230606013829-94b81fcefb58 ## explicit; go 1.18 knative.dev/pkg/apis knative.dev/pkg/apis/duck @@ -1786,7 +1786,7 @@ knative.dev/pkg/tracing/propagation knative.dev/pkg/tracing/propagation/tracecontextb3 knative.dev/pkg/tracker knative.dev/pkg/webhook/resourcesemantics -# knative.dev/serving v0.37.1-0.20230603021539-349b2d61b0e8 +# knative.dev/serving v0.37.1-0.20230606023926-c95f17bd0631 ## explicit; go 1.18 knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1