From 9623e517934f6b812d1655ac5884fcd83eee81b2 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Fri, 25 Oct 2024 13:29:26 +0000 Subject: [PATCH] upgrade to latest dependencies bumping knative.dev/pkg 9b9d535...6af2bf9: > 6af2bf9 upgrade to latest dependencies (# 3110) > 76cfa12 Fix `WEBHOOK_DISABLE_NAMESPACE_OWNERSHIP` env-var (# 3107) > 6d10851 Add `WEBHOOK_DISABLE_NAMESPACE_OWNERSHIP` env-var (# 3103) > 6eb75e8 Update community files (# 3105) bumping knative.dev/reconciler-test 09111f0...aae114c: > aae114c upgrade to latest dependencies (# 771) > 9d5e1c0 Update community files (# 770) > 22c241b upgrade to latest dependencies (# 769) > 3e8ae56 Update community files (# 768) bumping knative.dev/hack 05b2fb3...ef6e7e9: > ef6e7e9 Export KO_FLAGS for consuming scripts (# 401) > 2191456 Update community files (# 400) bumping knative.dev/hack/schema 05b2fb3...ef6e7e9: > ef6e7e9 Export KO_FLAGS for consuming scripts (# 401) > 2191456 Update community files (# 400) bumping knative.dev/eventing 291c0a8...65aeab5: > 65aeab5 [main] Upgrade to latest dependencies (# 8275) > 03ba8f4 feat: autocreate v1beta3 eventtypes (# 8276) Signed-off-by: Knative Automation --- go.mod | 10 ++++---- go.sum | 20 +++++++-------- .../{v1beta2 => v1beta3}/eventtype.go | 24 +++++++++--------- .../expansion_generated.go | 2 +- .../eventing/pkg/eventtype/eventtypes.go | 25 +++++++++++-------- vendor/knative.dev/hack/release.sh | 2 +- vendor/modules.txt | 12 ++++----- 7 files changed, 49 insertions(+), 46 deletions(-) rename vendor/knative.dev/eventing/pkg/client/listers/eventing/{v1beta2 => v1beta3}/eventtype.go (83%) rename vendor/knative.dev/eventing/pkg/client/listers/eventing/{v1beta2 => v1beta3}/expansion_generated.go (98%) diff --git a/go.mod b/go.mod index 1fd1b3a8b..b22922a3f 100644 --- a/go.mod +++ b/go.mod @@ -20,11 +20,11 @@ require ( k8s.io/apimachinery v0.30.3 k8s.io/client-go v0.30.3 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 - knative.dev/eventing v0.43.0 - knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d - knative.dev/hack/schema v0.0.0-20241010131451-05b2fb30cb4d - knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad - knative.dev/reconciler-test v0.0.0-20241015093232-09111f0f1364 + knative.dev/eventing v0.43.1-0.20241025105802-65aeab55d676 + knative.dev/hack v0.0.0-20241025103803-ef6e7e983a60 + knative.dev/hack/schema v0.0.0-20241025103803-ef6e7e983a60 + knative.dev/pkg v0.0.0-20241024133302-6af2bf9747e9 + knative.dev/reconciler-test v0.0.0-20241024141702-aae114c1c0e3 ) require ( diff --git a/go.sum b/go.sum index c59967828..748bcefef 100644 --- a/go.sum +++ b/go.sum @@ -825,16 +825,16 @@ k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 h1:1Wof1cGQgA5pqgo8MxKPtf k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8/go.mod h1:Os6V6dZwLNii3vxFpxcNaTmH8LJJBkOTg1N0tOA0fvA= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -knative.dev/eventing v0.43.0 h1:GELHZ0yYosMeV78l4alMsd7HJciEu6a3T2C5l7MPi3Y= -knative.dev/eventing v0.43.0/go.mod h1:pdrF+bEUfRkNn9ifWXS7DoVj5W31gA5KQVd8iwplXUo= -knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d h1:aCfX7kwkvgGxXXGbso5tLqdwQmzBkJ9d+EIRwksKTvk= -knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= -knative.dev/hack/schema v0.0.0-20241010131451-05b2fb30cb4d h1:N+UlBE8F8LJUh/m6cYSwzqdqNg65BD9jbWoWO9nfqEA= -knative.dev/hack/schema v0.0.0-20241010131451-05b2fb30cb4d/go.mod h1:jRH/sx6mwwuMVhvJgnzSaoYA1N4qaIkJa+zxEGtVA5I= -knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad h1:Nrjtr2H168rJeamH4QdyLMV1lEKHejNhaj1ymgQMfLk= -knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad/go.mod h1:StJI72GWcm/iErmk4RqFJiOo8RLbVqPbHxUqeVwAzeo= -knative.dev/reconciler-test v0.0.0-20241015093232-09111f0f1364 h1:DIc+vbaFKOSGktPXJ1MaXIXoDjlmUIXQkHiZaPcYGbQ= -knative.dev/reconciler-test v0.0.0-20241015093232-09111f0f1364/go.mod h1:PVRnK/YQo9s3foRtut00oAxvCPc9f/qV2PApZh/rMPw= +knative.dev/eventing v0.43.1-0.20241025105802-65aeab55d676 h1:fWmwnq9ZbX0RmUSic9tZtUQl0ezQ5elUajG3oWnMPfU= +knative.dev/eventing v0.43.1-0.20241025105802-65aeab55d676/go.mod h1:0izwspaO4Id2Zq7yTJFgYMjd1b9KDgjMAVyXKVgxivA= +knative.dev/hack v0.0.0-20241025103803-ef6e7e983a60 h1:LjBbosBvW/9/qjzIJtGpehPsbNWVvy1Fz8yZvMbFWe4= +knative.dev/hack v0.0.0-20241025103803-ef6e7e983a60/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= +knative.dev/hack/schema v0.0.0-20241025103803-ef6e7e983a60 h1:lQC/oc1VksTbv+MOxprFqz6g0rO8DZGocpM/2/gkCDM= +knative.dev/hack/schema v0.0.0-20241025103803-ef6e7e983a60/go.mod h1:jRH/sx6mwwuMVhvJgnzSaoYA1N4qaIkJa+zxEGtVA5I= +knative.dev/pkg v0.0.0-20241024133302-6af2bf9747e9 h1:+aw7X2GqCCslYR4pC08a5NGalTBTP7QiNdEwDtqJi2k= +knative.dev/pkg v0.0.0-20241024133302-6af2bf9747e9/go.mod h1:F91q72nAoVVP9T0Y8gllA7cJ0+SXAQQ8Oa6x9xZ7Bwo= +knative.dev/reconciler-test v0.0.0-20241024141702-aae114c1c0e3 h1:pa3b/0EKzONPLBHqM0RFzG5EaB+k8OTyHGaUXWPIgns= +knative.dev/reconciler-test v0.0.0-20241024141702-aae114c1c0e3/go.mod h1:W9Kmdoxelg2mswUpDKerL/4Ih1/ouVhlSMeZeJ5LX9c= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/vendor/knative.dev/eventing/pkg/client/listers/eventing/v1beta2/eventtype.go b/vendor/knative.dev/eventing/pkg/client/listers/eventing/v1beta3/eventtype.go similarity index 83% rename from vendor/knative.dev/eventing/pkg/client/listers/eventing/v1beta2/eventtype.go rename to vendor/knative.dev/eventing/pkg/client/listers/eventing/v1beta3/eventtype.go index 4f84cd924..76d1efb30 100644 --- a/vendor/knative.dev/eventing/pkg/client/listers/eventing/v1beta2/eventtype.go +++ b/vendor/knative.dev/eventing/pkg/client/listers/eventing/v1beta3/eventtype.go @@ -16,13 +16,13 @@ limitations under the License. // Code generated by lister-gen. DO NOT EDIT. -package v1beta2 +package v1beta3 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta2 "knative.dev/eventing/pkg/apis/eventing/v1beta2" + v1beta3 "knative.dev/eventing/pkg/apis/eventing/v1beta3" ) // EventTypeLister helps list EventTypes. @@ -30,7 +30,7 @@ import ( type EventTypeLister interface { // List lists all EventTypes in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1beta2.EventType, err error) + List(selector labels.Selector) (ret []*v1beta3.EventType, err error) // EventTypes returns an object that can list and get EventTypes. EventTypes(namespace string) EventTypeNamespaceLister EventTypeListerExpansion @@ -47,9 +47,9 @@ func NewEventTypeLister(indexer cache.Indexer) EventTypeLister { } // List lists all EventTypes in the indexer. -func (s *eventTypeLister) List(selector labels.Selector) (ret []*v1beta2.EventType, err error) { +func (s *eventTypeLister) List(selector labels.Selector) (ret []*v1beta3.EventType, err error) { err = cache.ListAll(s.indexer, selector, func(m interface{}) { - ret = append(ret, m.(*v1beta2.EventType)) + ret = append(ret, m.(*v1beta3.EventType)) }) return ret, err } @@ -64,10 +64,10 @@ func (s *eventTypeLister) EventTypes(namespace string) EventTypeNamespaceLister type EventTypeNamespaceLister interface { // List lists all EventTypes in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1beta2.EventType, err error) + List(selector labels.Selector) (ret []*v1beta3.EventType, err error) // Get retrieves the EventType from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1beta2.EventType, error) + Get(name string) (*v1beta3.EventType, error) EventTypeNamespaceListerExpansion } @@ -79,21 +79,21 @@ type eventTypeNamespaceLister struct { } // List lists all EventTypes in the indexer for a given namespace. -func (s eventTypeNamespaceLister) List(selector labels.Selector) (ret []*v1beta2.EventType, err error) { +func (s eventTypeNamespaceLister) List(selector labels.Selector) (ret []*v1beta3.EventType, err error) { err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) { - ret = append(ret, m.(*v1beta2.EventType)) + ret = append(ret, m.(*v1beta3.EventType)) }) return ret, err } // Get retrieves the EventType from the indexer for a given namespace and name. -func (s eventTypeNamespaceLister) Get(name string) (*v1beta2.EventType, error) { +func (s eventTypeNamespaceLister) Get(name string) (*v1beta3.EventType, error) { obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name) if err != nil { return nil, err } if !exists { - return nil, errors.NewNotFound(v1beta2.Resource("eventtype"), name) + return nil, errors.NewNotFound(v1beta3.Resource("eventtype"), name) } - return obj.(*v1beta2.EventType), nil + return obj.(*v1beta3.EventType), nil } diff --git a/vendor/knative.dev/eventing/pkg/client/listers/eventing/v1beta2/expansion_generated.go b/vendor/knative.dev/eventing/pkg/client/listers/eventing/v1beta3/expansion_generated.go similarity index 98% rename from vendor/knative.dev/eventing/pkg/client/listers/eventing/v1beta2/expansion_generated.go rename to vendor/knative.dev/eventing/pkg/client/listers/eventing/v1beta3/expansion_generated.go index 4363c0140..465a79ef9 100644 --- a/vendor/knative.dev/eventing/pkg/client/listers/eventing/v1beta2/expansion_generated.go +++ b/vendor/knative.dev/eventing/pkg/client/listers/eventing/v1beta3/expansion_generated.go @@ -16,7 +16,7 @@ limitations under the License. // Code generated by lister-gen. DO NOT EDIT. -package v1beta2 +package v1beta3 // EventTypeListerExpansion allows custom methods to be added to // EventTypeLister. diff --git a/vendor/knative.dev/eventing/pkg/eventtype/eventtypes.go b/vendor/knative.dev/eventing/pkg/eventtype/eventtypes.go index 178a1a5e1..1bf711621 100644 --- a/vendor/knative.dev/eventing/pkg/eventtype/eventtypes.go +++ b/vendor/knative.dev/eventing/pkg/eventtype/eventtypes.go @@ -29,18 +29,18 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "knative.dev/eventing/pkg/apis/eventing/v1beta2" + "knative.dev/eventing/pkg/apis/eventing/v1beta3" "knative.dev/eventing/pkg/apis/feature" - eventingv1beta2 "knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta2" - v1beta22 "knative.dev/eventing/pkg/client/listers/eventing/v1beta2" + eventingv1beta3 "knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta3" + v1beta33 "knative.dev/eventing/pkg/client/listers/eventing/v1beta3" "knative.dev/eventing/pkg/utils" "knative.dev/pkg/apis" duckv1 "knative.dev/pkg/apis/duck/v1" ) type EventTypeAutoHandler struct { - EventTypeLister v1beta22.EventTypeLister - EventingClient eventingv1beta2.EventingV1beta2Interface + EventTypeLister v1beta33.EventTypeLister + EventingClient eventingv1beta3.EventingV1beta3Interface FeatureStore *feature.Store Logger *zap.Logger } @@ -80,7 +80,7 @@ func (h *EventTypeAutoHandler) AutoCreateEventType(ctx context.Context, event *e source, _ := apis.ParseURL(event.Source()) schema, _ := apis.ParseURL(event.DataSchema()) - et := &v1beta2.EventType{ + et := &v1beta3.EventType{ ObjectMeta: metav1.ObjectMeta{ Name: eventTypeName, Namespace: addressable.Namespace, @@ -93,11 +93,14 @@ func (h *EventTypeAutoHandler) AutoCreateEventType(ctx context.Context, event *e }, }, }, - Spec: v1beta2.EventTypeSpec{ - Type: event.Type(), - Source: source, - Schema: schema, - SchemaData: event.DataSchema(), + Spec: v1beta3.EventTypeSpec{ + Attributes: []v1beta3.EventAttributeDefinition{ + {Name: "type", Value: event.Type(), Required: true}, + {Name: "source", Value: source.String(), Required: true}, + {Name: "schemadata", Value: schema.String(), Required: true}, + {Name: "specversion", Value: event.SpecVersion(), Required: true}, + {Name: "id", Required: false}, + }, Reference: addressable, Description: "Event Type auto-created by controller", }, diff --git a/vendor/knative.dev/hack/release.sh b/vendor/knative.dev/hack/release.sh index 450c0671b..a378a5f80 100644 --- a/vendor/knative.dev/hack/release.sh +++ b/vendor/knative.dev/hack/release.sh @@ -75,7 +75,7 @@ RELEASE_NOTES="" RELEASE_BRANCH="" RELEASE_GCS_BUCKET="knative-nightly/${REPO_NAME}" RELEASE_DIR="" -KO_FLAGS="-P --platform=all" +export KO_FLAGS="-P --platform=all" VALIDATION_TESTS="./test/presubmit-tests.sh" ARTIFACTS_TO_PUBLISH="" FROM_NIGHTLY_RELEASE="" diff --git a/vendor/modules.txt b/vendor/modules.txt index 0212cabde..20d41298e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1059,7 +1059,7 @@ k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/eventing v0.43.0 +# knative.dev/eventing v0.43.1-0.20241025105802-65aeab55d676 ## explicit; go 1.22.0 knative.dev/eventing/pkg/apis knative.dev/eventing/pkg/apis/config @@ -1113,7 +1113,7 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake knative.dev/eventing/pkg/client/injection/client knative.dev/eventing/pkg/client/injection/client/fake knative.dev/eventing/pkg/client/listers/eventing/v1alpha1 -knative.dev/eventing/pkg/client/listers/eventing/v1beta2 +knative.dev/eventing/pkg/client/listers/eventing/v1beta3 knative.dev/eventing/pkg/crossnamespace knative.dev/eventing/pkg/eventfilter knative.dev/eventing/pkg/eventfilter/attributes @@ -1129,16 +1129,16 @@ knative.dev/eventing/test/lib/sender knative.dev/eventing/test/test_images knative.dev/eventing/test/test_images/event-sender knative.dev/eventing/test/test_images/print -# knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d +# knative.dev/hack v0.0.0-20241025103803-ef6e7e983a60 ## explicit; go 1.21 knative.dev/hack -# knative.dev/hack/schema v0.0.0-20241010131451-05b2fb30cb4d +# knative.dev/hack/schema v0.0.0-20241025103803-ef6e7e983a60 ## explicit; go 1.21 knative.dev/hack/schema/commands knative.dev/hack/schema/docs knative.dev/hack/schema/registry knative.dev/hack/schema/schema -# knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad +# knative.dev/pkg v0.0.0-20241024133302-6af2bf9747e9 ## explicit; go 1.22.0 knative.dev/pkg/apis knative.dev/pkg/apis/duck @@ -1215,7 +1215,7 @@ knative.dev/pkg/webhook/json knative.dev/pkg/webhook/resourcesemantics knative.dev/pkg/webhook/resourcesemantics/defaulting knative.dev/pkg/webhook/resourcesemantics/validation -# knative.dev/reconciler-test v0.0.0-20241015093232-09111f0f1364 +# knative.dev/reconciler-test v0.0.0-20241024141702-aae114c1c0e3 ## explicit; go 1.22.0 knative.dev/reconciler-test/cmd/eventshub knative.dev/reconciler-test/pkg/environment