diff --git a/go.mod b/go.mod index 758d7e7d7f..774fedf6fd 100644 --- a/go.mod +++ b/go.mod @@ -20,12 +20,12 @@ require ( k8s.io/apimachinery v0.30.3 k8s.io/client-go v0.30.3 k8s.io/code-generator v0.30.3 - knative.dev/caching v0.0.0-20241024133002-38fe7e0adfea - knative.dev/eventing v0.43.0 - knative.dev/hack v0.0.0-20241016013844-21914567fbb4 + knative.dev/caching v0.0.0-20241024134602-3f5cd81853a0 + knative.dev/eventing v0.43.1-0.20241025105802-65aeab55d676 + knative.dev/hack v0.0.0-20241025103803-ef6e7e983a60 knative.dev/pkg v0.0.0-20241024133302-6af2bf9747e9 - knative.dev/reconciler-test v0.0.0-20241024013603-9d5e1c05a755 - knative.dev/serving v0.43.1-0.20241024134208-e8e7de578464 + knative.dev/reconciler-test v0.0.0-20241024141702-aae114c1c0e3 + knative.dev/serving v0.43.1-0.20241025124202-16d2da814851 sigs.k8s.io/yaml v1.4.0 ) @@ -154,7 +154,7 @@ require ( k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 // indirect k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect - knative.dev/networking v0.0.0-20241022012959-60e29ff520dc // indirect + knative.dev/networking v0.0.0-20241024135302-d5387fab1de1 // indirect sigs.k8s.io/controller-runtime v0.7.2 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect diff --git a/go.sum b/go.sum index c1dcf7b7f9..0d2f169806 100644 --- a/go.sum +++ b/go.sum @@ -1391,20 +1391,20 @@ k8s.io/utils v0.0.0-20200912215256-4140de9c8800/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= 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/caching v0.0.0-20241024133002-38fe7e0adfea h1:kuR/TU9SRkVVp5NM8/RN4DqCEMSCeMWWRXBm1AhPW4M= -knative.dev/caching v0.0.0-20241024133002-38fe7e0adfea/go.mod h1:hFI6O91en6qYdojzQHJ0XbVXlhICiBavzI/RvgjNCCA= -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-20241016013844-21914567fbb4 h1:+hdbDCWjRmkbDghA9/ZLKSjSIG138dPV3K2exX4uxMA= -knative.dev/hack v0.0.0-20241016013844-21914567fbb4/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= -knative.dev/networking v0.0.0-20241022012959-60e29ff520dc h1:0d9XXRLlyuHfINZLlYqo/BYe/+chqqNBMLKJldjTbtw= -knative.dev/networking v0.0.0-20241022012959-60e29ff520dc/go.mod h1:G56j6VCLzfaN9yZ4IqfNyN4c3U1czvhUmKeZX4UjQ8Q= +knative.dev/caching v0.0.0-20241024134602-3f5cd81853a0 h1:l1LdDpHpILHw/z0zmRnQsAQGteSXlC/VToHcu1qk+A4= +knative.dev/caching v0.0.0-20241024134602-3f5cd81853a0/go.mod h1:dDbjWQ3bY15TU6FSJ4I9C6noGKpu+MvPGOLHjDf4zx4= +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/networking v0.0.0-20241024135302-d5387fab1de1 h1:eU3Jgfr3XjxRJkyyOp2wSoI/pm9Z0I1wgw6iBxG1VUo= +knative.dev/networking v0.0.0-20241024135302-d5387fab1de1/go.mod h1:slScd6CR0VlxLiKVFSJTVj/ne8C7elWEE4F93nVOOJk= 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-20241024013603-9d5e1c05a755 h1:xplxjQle0fGa1XIKBwA16rjzY9Ol6koxiK6jE9ku0ho= -knative.dev/reconciler-test v0.0.0-20241024013603-9d5e1c05a755/go.mod h1:feNx6+U/nmvm9FxHKB2BA2l5Jh7gPi8ifYYoDkcrU+Y= -knative.dev/serving v0.43.1-0.20241024134208-e8e7de578464 h1:zA4K+QD561xu0DXa0H/8UM5s2MC9suaSSFobzCbnxpE= -knative.dev/serving v0.43.1-0.20241024134208-e8e7de578464/go.mod h1:qYjwZdjv3SD7t+Tk/hvxml824G5njXZrycmCBBALpJk= +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= +knative.dev/serving v0.43.1-0.20241025124202-16d2da814851 h1:iIqXMol/cei3PAyRizQrBE+NSFR/fq8GdAp8g62Uqi4= +knative.dev/serving v0.43.1-0.20241025124202-16d2da814851/go.mod h1:FGW1QEwQ0x2KWenTEZ+YNflBdBL9ATC8okmDoHo+yJ0= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw= pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= 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 4f84cd9245..76d1efb301 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 4363c01406..465a79ef97 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 178a1a5e1d..1bf7116213 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 450c0671b1..a378a5f805 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 e2aa23c2e3..25e0ba23c4 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1362,11 +1362,11 @@ k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/caching v0.0.0-20241024133002-38fe7e0adfea +# knative.dev/caching v0.0.0-20241024134602-3f5cd81853a0 ## explicit; go 1.22.0 knative.dev/caching/pkg/apis/caching knative.dev/caching/pkg/apis/caching/v1alpha1 -# knative.dev/eventing v0.43.0 +# knative.dev/eventing v0.43.1-0.20241025105802-65aeab55d676 ## explicit; go 1.22.0 knative.dev/eventing/cmd/heartbeats knative.dev/eventing/pkg/apis @@ -1408,7 +1408,7 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1 knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2 knative.dev/eventing/pkg/client/injection/client 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/duck knative.dev/eventing/pkg/eventfilter @@ -1453,10 +1453,10 @@ knative.dev/eventing/test/upgrade/prober/wathola/fetcher knative.dev/eventing/test/upgrade/prober/wathola/forwarder knative.dev/eventing/test/upgrade/prober/wathola/receiver knative.dev/eventing/test/upgrade/prober/wathola/sender -# knative.dev/hack v0.0.0-20241016013844-21914567fbb4 +# knative.dev/hack v0.0.0-20241025103803-ef6e7e983a60 ## explicit; go 1.21 knative.dev/hack -# knative.dev/networking v0.0.0-20241022012959-60e29ff520dc +# knative.dev/networking v0.0.0-20241024135302-d5387fab1de1 ## explicit; go 1.22.0 knative.dev/networking/pkg knative.dev/networking/pkg/apis/networking @@ -1553,7 +1553,7 @@ knative.dev/pkg/webhook knative.dev/pkg/webhook/certificates knative.dev/pkg/webhook/certificates/resources knative.dev/pkg/webhook/resourcesemantics/conversion -# knative.dev/reconciler-test v0.0.0-20241024013603-9d5e1c05a755 +# 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 @@ -1582,7 +1582,7 @@ knative.dev/reconciler-test/pkg/resources/service knative.dev/reconciler-test/pkg/resources/serviceaccount knative.dev/reconciler-test/pkg/state knative.dev/reconciler-test/resources/certificate -# knative.dev/serving v0.43.1-0.20241024134208-e8e7de578464 +# knative.dev/serving v0.43.1-0.20241025124202-16d2da814851 ## explicit; go 1.22.0 knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1