Please run ./hack/update-codegen.sh. diff --git a/control-plane/pkg/apis/bindings/v1/zz_generated.deepcopy.go b/control-plane/pkg/apis/bindings/v1/zz_generated.deepcopy.go index 26f6606..a7db6de 100644 --- a/control-plane/pkg/apis/bindings/v1/zz_generated.deepcopy.go +++ b/control-plane/pkg/apis/bindings/v1/zz_generated.deepcopy.go @@ -22,7 +22,7 @@ package v1 import ( - v1 "k8s.io/api/core/v1" + corev1 "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -205,7 +205,7 @@ func (in *SecretValueFromSource) DeepCopyInto(out *SecretValueFromSource) { *out = *in if in.SecretKeyRef != nil { in, out := &in.SecretKeyRef, &out.SecretKeyRef - *out = new(v1.SecretKeySelector) + *out = new(corev1.SecretKeySelector) (*in).DeepCopyInto(*out) } return

Please run ./hack/update-codegen.sh. diff --git a/control-plane/pkg/apis/sources/v1/zz_generated.deepcopy.go b/control-plane/pkg/apis/sources/v1/zz_generated.deepcopy.go index 1eadd47..dd7160e 100644 --- a/control-plane/pkg/apis/sources/v1/zz_generated.deepcopy.go +++ b/control-plane/pkg/apis/sources/v1/zz_generated.deepcopy.go @@ -23,7 +23,7 @@ package v1 import ( runtime "k8s.io/apimachinery/pkg/runtime" - v1 "knative.dev/eventing/pkg/apis/duck/v1" + duckv1 "knative.dev/eventing/pkg/apis/duck/v1" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. @@ -103,7 +103,7 @@ func (in *KafkaSourceSpec) DeepCopyInto(out *KafkaSourceSpec) { } if in.Delivery != nil { in, out := &in.Delivery, &out.Delivery - *out = new(v1.DeliverySpec) + *out = new(duckv1.DeliverySpec) (*in).DeepCopyInto(*out) } if in.Ordering != nil {

Please run ./hack/update-codegen.sh. diff --git a/control-plane/pkg/client/clientset/versioned/clientset.go b/control-plane/pkg/client/clientset/versioned/clientset.go index b67f8a6..2ce9b59 100644 --- a/control-plane/pkg/client/clientset/versioned/clientset.go +++ b/control-plane/pkg/client/clientset/versioned/clientset.go @@ -25,32 +25,43 @@ import ( discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" + bindingsv1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/bindings/v1" bindingsv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/bindings/v1beta1" eventingv1alpha1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/eventing/v1alpha1" internalv1alpha1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/internalskafkaeventing/v1alpha1" messagingv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/messaging/v1beta1" + sourcesv1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/sources/v1" sourcesv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/sources/v1beta1" ) type Interface interface { Discovery() discovery.DiscoveryInterface + BindingsV1() bindingsv1.BindingsV1Interface BindingsV1beta1() bindingsv1beta1.BindingsV1beta1Interface EventingV1alpha1() eventingv1alpha1.EventingV1alpha1Interface InternalV1alpha1() internalv1alpha1.InternalV1alpha1Interface MessagingV1beta1() messagingv1beta1.MessagingV1beta1Interface + SourcesV1() sourcesv1.SourcesV1Interface SourcesV1beta1() sourcesv1beta1.SourcesV1beta1Interface } // Clientset contains the clients for groups. type Clientset struct { *discovery.DiscoveryClient + bindingsV1 *bindingsv1.BindingsV1Client bindingsV1beta1 *bindingsv1beta1.BindingsV1beta1Client eventingV1alpha1 *eventingv1alpha1.EventingV1alpha1Client internalV1alpha1 *internalv1alpha1.InternalV1alpha1Client messagingV1beta1 *messagingv1beta1.MessagingV1beta1Client + sourcesV1 *sourcesv1.SourcesV1Client sourcesV1beta1 *sourcesv1beta1.SourcesV1beta1Client } +// BindingsV1 retrieves the BindingsV1Client +func (c *Clientset) BindingsV1() bindingsv1.BindingsV1Interface { + return c.bindingsV1 +} + // BindingsV1beta1 retrieves the BindingsV1beta1Client func (c *Clientset) BindingsV1beta1() bindingsv1beta1.BindingsV1beta1Interface { return c.bindingsV1beta1 @@ -71,6 +82,11 @@ func (c *Clientset) MessagingV1beta1() messagingv1beta1.MessagingV1beta1Interfac return c.messagingV1beta1 } +// SourcesV1 retrieves the SourcesV1Client +func (c *Clientset) SourcesV1() sourcesv1.SourcesV1Interface { + return c.sourcesV1 +} + // SourcesV1beta1 retrieves the SourcesV1beta1Client func (c *Clientset) SourcesV1beta1() sourcesv1beta1.SourcesV1beta1Interface { return c.sourcesV1beta1 @@ -120,6 +136,10 @@ func NewForConfigAndClient(c *rest.Config, httpClient *http.Client) (*Clientset, var cs Clientset var err error + cs.bindingsV1, err = bindingsv1.NewForConfigAndClient(&configShallowCopy, httpClient) + if err != nil { + return nil, err + } cs.bindingsV1beta1, err = bindingsv1beta1.NewForConfigAndClient(&configShallowCopy, httpClient) if err != nil { return nil, err @@ -136,6 +156,10 @@ func NewForConfigAndClient(c *rest.Config, httpClient *http.Client) (*Clientset, if err != nil { return nil, err } + cs.sourcesV1, err = sourcesv1.NewForConfigAndClient(&configShallowCopy, httpClient) + if err != nil { + return nil, err + } cs.sourcesV1beta1, err = sourcesv1beta1.NewForConfigAndClient(&configShallowCopy, httpClient) if err != nil { return nil, err @@ -161,10 +185,12 @@ func NewForConfigOrDie(c *rest.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c rest.Interface) *Clientset { var cs Clientset + cs.bindingsV1 = bindingsv1.New(c) cs.bindingsV1beta1 = bindin

Please run ./hack/update-codegen.sh. diff --git a/control-plane/pkg/client/clientset/versioned/fake/clientset_generated.go b/control-plane/pkg/client/clientset/versioned/fake/clientset_generated.go index 9ea1ba8..a756c4f 100644 --- a/control-plane/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/control-plane/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -25,6 +25,8 @@ import ( fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" clientset "knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned" + bindingsv1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/bindings/v1" + fakebindingsv1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/bindings/v1/fake" bindingsv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/bindings/v1beta1" fakebindingsv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/bindings/v1beta1/fake" eventingv1alpha1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/eventing/v1alpha1" @@ -33,6 +35,8 @@ import ( fakeinternalv1alpha1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/internalskafkaeventing/v1alpha1/fake" messagingv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/messaging/v1beta1" fakemessagingv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/messaging/v1beta1/fake" + sourcesv1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/sources/v1" + fakesourcesv1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/sources/v1/fake" sourcesv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/sources/v1beta1" fakesourcesv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/sources/v1beta1/fake" ) @@ -87,6 +91,11 @@ var ( _ testing.FakeClient = &Clientset{} ) +// BindingsV1 retrieves the BindingsV1Client +func (c *Clientset) BindingsV1() bindingsv1.BindingsV1Interface { + return &fakebindingsv1.FakeBindingsV1{Fake: &c.Fake} +} + // BindingsV1beta1 retrieves the BindingsV1beta1Client func (c *Clientset) BindingsV1beta1() bindingsv1beta1.BindingsV1beta1Interface { return &fakebindingsv1beta1.FakeBindingsV1beta1{Fake: &c.Fake} @@ -107,6 +116,11 @@ func (c *Clientset) MessagingV1beta1() messagingv1beta1.MessagingV1beta1Interfac return &fakemessagingv1beta1.FakeMessagingV1beta1{Fake: &c.Fake} } +// SourcesV1 retrieves the SourcesV1Client +func (c *Clientset) SourcesV1() sourcesv1.SourcesV1Interface { + return &fakesourcesv1.FakeSourcesV1{Fake: &c.Fake} +} + // SourcesV1beta1 retrieves the SourcesV1beta1Client func (c *Clientset) SourcesV1beta1() sourcesv1beta1.SourcesV1beta1Interface { return &fakesourcesv1beta1.FakeSourcesV1beta1{Fake: &c.Fake}

Please run ./hack/update-codegen.sh. diff --git a/control-plane/pkg/client/clientset/versioned/fake/register.go b/control-plane/pkg/client/clientset/versioned/fake/register.go index 6c5909a..34e19e4 100644 --- a/control-plane/pkg/client/clientset/versioned/fake/register.go +++ b/control-plane/pkg/client/clientset/versioned/fake/register.go @@ -24,10 +24,12 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + bindingsv1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1" bindingsv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1" eventingv1alpha1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/eventing/v1alpha1" internalv1alpha1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/internalskafkaeventing/v1alpha1" messagingv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/messaging/v1beta1" + sourcesv1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1" sourcesv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1" ) @@ -35,10 +37,12 @@ var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) var localSchemeBuilder = runtime.SchemeBuilder{ + bindingsv1.AddToScheme, bindingsv1beta1.AddToScheme, eventingv1alpha1.AddToScheme, internalv1alpha1.AddToScheme, messagingv1beta1.AddToScheme, + sourcesv1.AddToScheme, sourcesv1beta1.AddToScheme, }

Please run ./hack/update-codegen.sh. diff --git a/control-plane/pkg/client/clientset/versioned/scheme/register.go b/control-plane/pkg/client/clientset/versioned/scheme/register.go index cb15517..cff3156 100644 --- a/control-plane/pkg/client/clientset/versioned/scheme/register.go +++ b/control-plane/pkg/client/clientset/versioned/scheme/register.go @@ -24,10 +24,12 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + bindingsv1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1" bindingsv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1" eventingv1alpha1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/eventing/v1alpha1" internalv1alpha1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/internalskafkaeventing/v1alpha1" messagingv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/messaging/v1beta1" + sourcesv1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1" sourcesv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1" ) @@ -35,10 +37,12 @@ var Scheme = runtime.NewScheme() var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) var localSchemeBuilder = runtime.SchemeBuilder{ + bindingsv1.AddToScheme, bindingsv1beta1.AddToScheme, eventingv1alpha1.AddToScheme, internalv1alpha1.AddToScheme, messagingv1beta1.AddToScheme, + sourcesv1.AddToScheme, sourcesv1beta1.AddToScheme, }

Please run ./hack/update-codegen.sh. diff --git a/control-plane/pkg/client/informers/externalversions/bindings/interface.go b/control-plane/pkg/client/informers/externalversions/bindings/interface.go index 5c2fef8..686913b 100644 --- a/control-plane/pkg/client/informers/externalversions/bindings/interface.go +++ b/control-plane/pkg/client/informers/externalversions/bindings/interface.go @@ -19,12 +19,15 @@ package bindings import ( + v1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/informers/externalversions/bindings/v1" v1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/informers/externalversions/bindings/v1beta1" internalinterfaces "knative.dev/eventing-kafka-broker/control-plane/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. type Interface interface { + // V1 provides access to shared informers for resources in V1. + V1() v1.Interface // V1beta1 provides access to shared informers for resources in V1beta1. V1beta1() v1beta1.Interface } @@ -40,6 +43,11 @@ func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakList return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } +// V1 returns a new v1.Interface. +func (g *group) V1() v1.Interface { + return v1.New(g.factory, g.namespace, g.tweakListOptions) +} + // V1beta1 returns a new v1beta1.Interface. func (g *group) V1beta1() v1beta1.Interface { return v1beta1.New(g.factory, g.namespace, g.tweakListOptions)

Please run ./hack/update-codegen.sh. diff --git a/control-plane/pkg/client/informers/externalversions/generic.go b/control-plane/pkg/client/informers/externalversions/generic.go index e07081a..6138400 100644 --- a/control-plane/pkg/client/informers/externalversions/generic.go +++ b/control-plane/pkg/client/informers/externalversions/generic.go @@ -23,10 +23,12 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" + v1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1" v1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1" v1alpha1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/eventing/v1alpha1" internalskafkaeventingv1alpha1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/internalskafkaeventing/v1alpha1" messagingv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/messaging/v1beta1" + sourcesv1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1" sourcesv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1" ) @@ -56,7 +58,11 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { - // Group=bindings.knative.dev, Version=v1beta1 + // Group=bindings.knative.dev, Version=v1 + case v1.SchemeGroupVersion.WithResource("kafkabindings"): + return &genericInformer{resource: resource.GroupResource(), informer: f.Bindings().V1().KafkaBindings().Informer()}, nil + + // Group=bindings.knative.dev, Version=v1beta1 case v1beta1.SchemeGroupVersion.WithResource("kafkabindings"): return &genericInformer{resource: resource.GroupResource(), informer: f.Bindings().V1beta1().KafkaBindings().Informer()}, nil @@ -74,6 +80,10 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource case messagingv1beta1.SchemeGroupVersion.WithResource("kafkachannels"): return &genericInformer{resource: resource.GroupResource(), informer: f.Messaging().V1beta1().KafkaChannels().Informer()}, nil + // Group=sources.knative.dev, Version=v1 + case sourcesv1.SchemeGroupVersion.WithResource("kafkasources"): + return &genericInformer{resource: resource.GroupResource(), informer: f.Sources().V1().KafkaSources().Informer()}, nil + // Group=sources.knative.dev, Version=v1beta1 case sourcesv1beta1.SchemeGroupVersion.WithResource("kafkasources"): return &genericInformer{resource: resource.GroupResource(), informer: f.Sources().V1beta1().KafkaSources().Informer()}, nil

Please run ./hack/update-codegen.sh. diff --git a/control-plane/pkg/client/informers/externalversions/sources/interface.go b/control-plane/pkg/client/informers/externalversions/sources/interface.go index 243f3b6..be1b5db 100644 --- a/control-plane/pkg/client/informers/externalversions/sources/interface.go +++ b/control-plane/pkg/client/informers/externalversions/sources/interface.go @@ -20,11 +20,14 @@ package sources import ( internalinterfaces "knative.dev/eventing-kafka-broker/control-plane/pkg/client/informers/externalversions/internalinterfaces" + v1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/informers/externalversions/sources/v1" v1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/informers/externalversions/sources/v1beta1" ) // Interface provides access to each of this group's versions. type Interface interface { + // V1 provides access to shared informers for resources in V1. + V1() v1.Interface // V1beta1 provides access to shared informers for resources in V1beta1. V1beta1() v1beta1.Interface } @@ -40,6 +43,11 @@ func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakList return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } +// V1 returns a new v1.Interface. +func (g *group) V1() v1.Interface { + return v1.New(g.factory, g.namespace, g.tweakListOptions) +} + // V1beta1 returns a new v1beta1.Interface. func (g *group) V1beta1() v1beta1.Interface { return v1beta1.New(g.factory, g.namespace, g.tweakListOptions)

Process completed with exit code 1.