diff --git a/apis/gcpfirewall/v1/zz_generated.register.go b/apis/gcpfirewall/v1/zz_generated.register.go index aa594fc..e720266 100644 --- a/apis/gcpfirewall/v1/zz_generated.register.go +++ b/apis/gcpfirewall/v1/zz_generated.register.go @@ -22,16 +22,14 @@ limitations under the License. package v1 import ( - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // GroupName specifies the group name used to register the objects. const GroupName = "networking.gke.io" // GroupVersion specifies the group and the version used to register the objects. -var GroupVersion = v1.GroupVersion{Group: GroupName, Version: "v1"} +var GroupVersion = metav1.GroupVersion{Group: GroupName, Version: "v1"} // SchemeGroupVersion is group version used to register these objects // Deprecated: use GroupVersion instead. @@ -65,6 +63,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &GCPFirewallList{}, ) // AddToGroupVersion allows the serialization of client types like ListOptions. - v1.AddToGroupVersion(scheme, SchemeGroupVersion) + metav1.AddToGroupVersion(scheme, SchemeGroupVersion) return nil } diff --git a/apis/network/v1/zz_generated.register.go b/apis/network/v1/zz_generated.register.go index c477dd9..ebeebf4 100644 --- a/apis/network/v1/zz_generated.register.go +++ b/apis/network/v1/zz_generated.register.go @@ -22,16 +22,14 @@ limitations under the License. package v1 import ( - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // GroupName specifies the group name used to register the objects. const GroupName = "networking.gke.io" // GroupVersion specifies the group and the version used to register the objects. -var GroupVersion = v1.GroupVersion{Group: GroupName, Version: "v1"} +var GroupVersion = metav1.GroupVersion{Group: GroupName, Version: "v1"} // SchemeGroupVersion is group version used to register these objects // Deprecated: use GroupVersion instead. @@ -71,6 +69,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &SubnetworkList{}, ) // AddToGroupVersion allows the serialization of client types like ListOptions. - v1.AddToGroupVersion(scheme, SchemeGroupVersion) + metav1.AddToGroupVersion(scheme, SchemeGroupVersion) return nil } diff --git a/apis/nodetopology/v1/zz_generated.register.go b/apis/nodetopology/v1/zz_generated.register.go index 2ca0dbf..a442ef7 100644 --- a/apis/nodetopology/v1/zz_generated.register.go +++ b/apis/nodetopology/v1/zz_generated.register.go @@ -22,16 +22,14 @@ limitations under the License. package v1 import ( - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // GroupName specifies the group name used to register the objects. const GroupName = "networking.gke.io" // GroupVersion specifies the group and the version used to register the objects. -var GroupVersion = v1.GroupVersion{Group: GroupName, Version: "v1"} +var GroupVersion = metav1.GroupVersion{Group: GroupName, Version: "v1"} // SchemeGroupVersion is group version used to register these objects // Deprecated: use GroupVersion instead. @@ -65,6 +63,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &NodeTopologyList{}, ) // AddToGroupVersion allows the serialization of client types like ListOptions. - v1.AddToGroupVersion(scheme, SchemeGroupVersion) + metav1.AddToGroupVersion(scheme, SchemeGroupVersion) return nil } diff --git a/client/gcpfirewall/clientset/versioned/clientset.go b/client/gcpfirewall/clientset/versioned/clientset.go index 711654f..5d1241c 100644 --- a/client/gcpfirewall/clientset/versioned/clientset.go +++ b/client/gcpfirewall/clientset/versioned/clientset.go @@ -19,8 +19,8 @@ limitations under the License. package versioned import ( - "fmt" - "net/http" + fmt "fmt" + http "net/http" networkingv1 "github.com/GoogleCloudPlatform/gke-networking-api/client/gcpfirewall/clientset/versioned/typed/gcpfirewall/v1" discovery "k8s.io/client-go/discovery" diff --git a/client/gcpfirewall/clientset/versioned/typed/gcpfirewall/v1/fake/fake_gcpfirewall.go b/client/gcpfirewall/clientset/versioned/typed/gcpfirewall/v1/fake/fake_gcpfirewall.go index a9f7dad..481b470 100644 --- a/client/gcpfirewall/clientset/versioned/typed/gcpfirewall/v1/fake/fake_gcpfirewall.go +++ b/client/gcpfirewall/clientset/versioned/typed/gcpfirewall/v1/fake/fake_gcpfirewall.go @@ -19,120 +19,30 @@ limitations under the License. package fake import ( - "context" - v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/gcpfirewall/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gcpfirewallv1 "github.com/GoogleCloudPlatform/gke-networking-api/client/gcpfirewall/clientset/versioned/typed/gcpfirewall/v1" + gentype "k8s.io/client-go/gentype" ) -// FakeGCPFirewalls implements GCPFirewallInterface -type FakeGCPFirewalls struct { +// fakeGCPFirewalls implements GCPFirewallInterface +type fakeGCPFirewalls struct { + *gentype.FakeClientWithList[*v1.GCPFirewall, *v1.GCPFirewallList] Fake *FakeNetworkingV1 } -var gcpfirewallsResource = v1.SchemeGroupVersion.WithResource("gcpfirewalls") - -var gcpfirewallsKind = v1.SchemeGroupVersion.WithKind("GCPFirewall") - -// Get takes name of the gCPFirewall, and returns the corresponding gCPFirewall object, and an error if there is any. -func (c *FakeGCPFirewalls) Get(ctx context.Context, name string, options metav1.GetOptions) (result *v1.GCPFirewall, err error) { - emptyResult := &v1.GCPFirewall{} - obj, err := c.Fake. - Invokes(testing.NewRootGetActionWithOptions(gcpfirewallsResource, name, options), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GCPFirewall), err -} - -// List takes label and field selectors, and returns the list of GCPFirewalls that match those selectors. -func (c *FakeGCPFirewalls) List(ctx context.Context, opts metav1.ListOptions) (result *v1.GCPFirewallList, err error) { - emptyResult := &v1.GCPFirewallList{} - obj, err := c.Fake. - Invokes(testing.NewRootListActionWithOptions(gcpfirewallsResource, gcpfirewallsKind, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1.GCPFirewallList{ListMeta: obj.(*v1.GCPFirewallList).ListMeta} - for _, item := range obj.(*v1.GCPFirewallList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested gCPFirewalls. -func (c *FakeGCPFirewalls) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchActionWithOptions(gcpfirewallsResource, opts)) -} - -// Create takes the representation of a gCPFirewall and creates it. Returns the server's representation of the gCPFirewall, and an error, if there is any. -func (c *FakeGCPFirewalls) Create(ctx context.Context, gCPFirewall *v1.GCPFirewall, opts metav1.CreateOptions) (result *v1.GCPFirewall, err error) { - emptyResult := &v1.GCPFirewall{} - obj, err := c.Fake. - Invokes(testing.NewRootCreateActionWithOptions(gcpfirewallsResource, gCPFirewall, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GCPFirewall), err -} - -// Update takes the representation of a gCPFirewall and updates it. Returns the server's representation of the gCPFirewall, and an error, if there is any. -func (c *FakeGCPFirewalls) Update(ctx context.Context, gCPFirewall *v1.GCPFirewall, opts metav1.UpdateOptions) (result *v1.GCPFirewall, err error) { - emptyResult := &v1.GCPFirewall{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateActionWithOptions(gcpfirewallsResource, gCPFirewall, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GCPFirewall), err -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeGCPFirewalls) UpdateStatus(ctx context.Context, gCPFirewall *v1.GCPFirewall, opts metav1.UpdateOptions) (result *v1.GCPFirewall, err error) { - emptyResult := &v1.GCPFirewall{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateSubresourceActionWithOptions(gcpfirewallsResource, "status", gCPFirewall, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GCPFirewall), err -} - -// Delete takes name of the gCPFirewall and deletes it. Returns an error if one occurs. -func (c *FakeGCPFirewalls) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteActionWithOptions(gcpfirewallsResource, name, opts), &v1.GCPFirewall{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeGCPFirewalls) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error { - action := testing.NewRootDeleteCollectionActionWithOptions(gcpfirewallsResource, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1.GCPFirewallList{}) - return err -} - -// Patch applies the patch and returns the patched gCPFirewall. -func (c *FakeGCPFirewalls) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.GCPFirewall, err error) { - emptyResult := &v1.GCPFirewall{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(gcpfirewallsResource, name, pt, data, opts, subresources...), emptyResult) - if obj == nil { - return emptyResult, err +func newFakeGCPFirewalls(fake *FakeNetworkingV1) gcpfirewallv1.GCPFirewallInterface { + return &fakeGCPFirewalls{ + gentype.NewFakeClientWithList[*v1.GCPFirewall, *v1.GCPFirewallList]( + fake.Fake, + "", + v1.SchemeGroupVersion.WithResource("gcpfirewalls"), + v1.SchemeGroupVersion.WithKind("GCPFirewall"), + func() *v1.GCPFirewall { return &v1.GCPFirewall{} }, + func() *v1.GCPFirewallList { return &v1.GCPFirewallList{} }, + func(dst, src *v1.GCPFirewallList) { dst.ListMeta = src.ListMeta }, + func(list *v1.GCPFirewallList) []*v1.GCPFirewall { return gentype.ToPointerSlice(list.Items) }, + func(list *v1.GCPFirewallList, items []*v1.GCPFirewall) { list.Items = gentype.FromPointerSlice(items) }, + ), + fake, } - return obj.(*v1.GCPFirewall), err } diff --git a/client/gcpfirewall/clientset/versioned/typed/gcpfirewall/v1/fake/fake_gcpfirewall_client.go b/client/gcpfirewall/clientset/versioned/typed/gcpfirewall/v1/fake/fake_gcpfirewall_client.go index 9a077dc..0b2be48 100644 --- a/client/gcpfirewall/clientset/versioned/typed/gcpfirewall/v1/fake/fake_gcpfirewall_client.go +++ b/client/gcpfirewall/clientset/versioned/typed/gcpfirewall/v1/fake/fake_gcpfirewall_client.go @@ -29,7 +29,7 @@ type FakeNetworkingV1 struct { } func (c *FakeNetworkingV1) GCPFirewalls() v1.GCPFirewallInterface { - return &FakeGCPFirewalls{c} + return newFakeGCPFirewalls(c) } // RESTClient returns a RESTClient that is used to communicate diff --git a/client/gcpfirewall/clientset/versioned/typed/gcpfirewall/v1/gcpfirewall.go b/client/gcpfirewall/clientset/versioned/typed/gcpfirewall/v1/gcpfirewall.go index 3cccae8..aed3a23 100644 --- a/client/gcpfirewall/clientset/versioned/typed/gcpfirewall/v1/gcpfirewall.go +++ b/client/gcpfirewall/clientset/versioned/typed/gcpfirewall/v1/gcpfirewall.go @@ -19,9 +19,9 @@ limitations under the License. package v1 import ( - "context" + context "context" - v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/gcpfirewall/v1" + gcpfirewallv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/gcpfirewall/v1" scheme "github.com/GoogleCloudPlatform/gke-networking-api/client/gcpfirewall/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -37,33 +37,34 @@ type GCPFirewallsGetter interface { // GCPFirewallInterface has methods to work with GCPFirewall resources. type GCPFirewallInterface interface { - Create(ctx context.Context, gCPFirewall *v1.GCPFirewall, opts metav1.CreateOptions) (*v1.GCPFirewall, error) - Update(ctx context.Context, gCPFirewall *v1.GCPFirewall, opts metav1.UpdateOptions) (*v1.GCPFirewall, error) + Create(ctx context.Context, gCPFirewall *gcpfirewallv1.GCPFirewall, opts metav1.CreateOptions) (*gcpfirewallv1.GCPFirewall, error) + Update(ctx context.Context, gCPFirewall *gcpfirewallv1.GCPFirewall, opts metav1.UpdateOptions) (*gcpfirewallv1.GCPFirewall, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, gCPFirewall *v1.GCPFirewall, opts metav1.UpdateOptions) (*v1.GCPFirewall, error) + UpdateStatus(ctx context.Context, gCPFirewall *gcpfirewallv1.GCPFirewall, opts metav1.UpdateOptions) (*gcpfirewallv1.GCPFirewall, error) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error - Get(ctx context.Context, name string, opts metav1.GetOptions) (*v1.GCPFirewall, error) - List(ctx context.Context, opts metav1.ListOptions) (*v1.GCPFirewallList, error) + Get(ctx context.Context, name string, opts metav1.GetOptions) (*gcpfirewallv1.GCPFirewall, error) + List(ctx context.Context, opts metav1.ListOptions) (*gcpfirewallv1.GCPFirewallList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.GCPFirewall, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *gcpfirewallv1.GCPFirewall, err error) GCPFirewallExpansion } // gCPFirewalls implements GCPFirewallInterface type gCPFirewalls struct { - *gentype.ClientWithList[*v1.GCPFirewall, *v1.GCPFirewallList] + *gentype.ClientWithList[*gcpfirewallv1.GCPFirewall, *gcpfirewallv1.GCPFirewallList] } // newGCPFirewalls returns a GCPFirewalls func newGCPFirewalls(c *NetworkingV1Client) *gCPFirewalls { return &gCPFirewalls{ - gentype.NewClientWithList[*v1.GCPFirewall, *v1.GCPFirewallList]( + gentype.NewClientWithList[*gcpfirewallv1.GCPFirewall, *gcpfirewallv1.GCPFirewallList]( "gcpfirewalls", c.RESTClient(), scheme.ParameterCodec, "", - func() *v1.GCPFirewall { return &v1.GCPFirewall{} }, - func() *v1.GCPFirewallList { return &v1.GCPFirewallList{} }), + func() *gcpfirewallv1.GCPFirewall { return &gcpfirewallv1.GCPFirewall{} }, + func() *gcpfirewallv1.GCPFirewallList { return &gcpfirewallv1.GCPFirewallList{} }, + ), } } diff --git a/client/gcpfirewall/clientset/versioned/typed/gcpfirewall/v1/gcpfirewall_client.go b/client/gcpfirewall/clientset/versioned/typed/gcpfirewall/v1/gcpfirewall_client.go index 336fc61..3620797 100644 --- a/client/gcpfirewall/clientset/versioned/typed/gcpfirewall/v1/gcpfirewall_client.go +++ b/client/gcpfirewall/clientset/versioned/typed/gcpfirewall/v1/gcpfirewall_client.go @@ -19,10 +19,10 @@ limitations under the License. package v1 import ( - "net/http" + http "net/http" - v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/gcpfirewall/v1" - "github.com/GoogleCloudPlatform/gke-networking-api/client/gcpfirewall/clientset/versioned/scheme" + gcpfirewallv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/gcpfirewall/v1" + scheme "github.com/GoogleCloudPlatform/gke-networking-api/client/gcpfirewall/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) @@ -85,10 +85,10 @@ func New(c rest.Interface) *NetworkingV1Client { } func setConfigDefaults(config *rest.Config) error { - gv := v1.SchemeGroupVersion + gv := gcpfirewallv1.SchemeGroupVersion config.GroupVersion = &gv config.APIPath = "/apis" - config.NegotiatedSerializer = scheme.Codecs.WithoutConversion() + config.NegotiatedSerializer = rest.CodecFactoryForGeneratedClient(scheme.Scheme, scheme.Codecs).WithoutConversion() if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() diff --git a/client/gcpfirewall/informers/externalversions/gcpfirewall/v1/gcpfirewall.go b/client/gcpfirewall/informers/externalversions/gcpfirewall/v1/gcpfirewall.go index 907f90b..adc893f 100644 --- a/client/gcpfirewall/informers/externalversions/gcpfirewall/v1/gcpfirewall.go +++ b/client/gcpfirewall/informers/externalversions/gcpfirewall/v1/gcpfirewall.go @@ -19,13 +19,13 @@ limitations under the License. package v1 import ( - "context" + context "context" time "time" - gcpfirewallv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/gcpfirewall/v1" + apisgcpfirewallv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/gcpfirewall/v1" versioned "github.com/GoogleCloudPlatform/gke-networking-api/client/gcpfirewall/clientset/versioned" internalinterfaces "github.com/GoogleCloudPlatform/gke-networking-api/client/gcpfirewall/informers/externalversions/internalinterfaces" - v1 "github.com/GoogleCloudPlatform/gke-networking-api/client/gcpfirewall/listers/gcpfirewall/v1" + gcpfirewallv1 "github.com/GoogleCloudPlatform/gke-networking-api/client/gcpfirewall/listers/gcpfirewall/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -36,7 +36,7 @@ import ( // GCPFirewalls. type GCPFirewallInformer interface { Informer() cache.SharedIndexInformer - Lister() v1.GCPFirewallLister + Lister() gcpfirewallv1.GCPFirewallLister } type gCPFirewallInformer struct { @@ -70,7 +70,7 @@ func NewFilteredGCPFirewallInformer(client versioned.Interface, resyncPeriod tim return client.NetworkingV1().GCPFirewalls().Watch(context.TODO(), options) }, }, - &gcpfirewallv1.GCPFirewall{}, + &apisgcpfirewallv1.GCPFirewall{}, resyncPeriod, indexers, ) @@ -81,9 +81,9 @@ func (f *gCPFirewallInformer) defaultInformer(client versioned.Interface, resync } func (f *gCPFirewallInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&gcpfirewallv1.GCPFirewall{}, f.defaultInformer) + return f.factory.InformerFor(&apisgcpfirewallv1.GCPFirewall{}, f.defaultInformer) } -func (f *gCPFirewallInformer) Lister() v1.GCPFirewallLister { - return v1.NewGCPFirewallLister(f.Informer().GetIndexer()) +func (f *gCPFirewallInformer) Lister() gcpfirewallv1.GCPFirewallLister { + return gcpfirewallv1.NewGCPFirewallLister(f.Informer().GetIndexer()) } diff --git a/client/gcpfirewall/informers/externalversions/generic.go b/client/gcpfirewall/informers/externalversions/generic.go index 2d62eab..b3acfbf 100644 --- a/client/gcpfirewall/informers/externalversions/generic.go +++ b/client/gcpfirewall/informers/externalversions/generic.go @@ -19,7 +19,7 @@ limitations under the License. package externalversions import ( - "fmt" + fmt "fmt" v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/gcpfirewall/v1" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/client/gcpfirewall/listers/gcpfirewall/v1/gcpfirewall.go b/client/gcpfirewall/listers/gcpfirewall/v1/gcpfirewall.go index e4b7b43..c573fc8 100644 --- a/client/gcpfirewall/listers/gcpfirewall/v1/gcpfirewall.go +++ b/client/gcpfirewall/listers/gcpfirewall/v1/gcpfirewall.go @@ -19,10 +19,10 @@ limitations under the License. package v1 import ( - v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/gcpfirewall/v1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" + gcpfirewallv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/gcpfirewall/v1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" ) // GCPFirewallLister helps list GCPFirewalls. @@ -30,19 +30,19 @@ import ( type GCPFirewallLister interface { // List lists all GCPFirewalls in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.GCPFirewall, err error) + List(selector labels.Selector) (ret []*gcpfirewallv1.GCPFirewall, err error) // Get retrieves the GCPFirewall from the index for a given name. // Objects returned here must be treated as read-only. - Get(name string) (*v1.GCPFirewall, error) + Get(name string) (*gcpfirewallv1.GCPFirewall, error) GCPFirewallListerExpansion } // gCPFirewallLister implements the GCPFirewallLister interface. type gCPFirewallLister struct { - listers.ResourceIndexer[*v1.GCPFirewall] + listers.ResourceIndexer[*gcpfirewallv1.GCPFirewall] } // NewGCPFirewallLister returns a new GCPFirewallLister. func NewGCPFirewallLister(indexer cache.Indexer) GCPFirewallLister { - return &gCPFirewallLister{listers.New[*v1.GCPFirewall](indexer, v1.Resource("gcpfirewall"))} + return &gCPFirewallLister{listers.New[*gcpfirewallv1.GCPFirewall](indexer, gcpfirewallv1.Resource("gcpfirewall"))} } diff --git a/client/network/clientset/versioned/clientset.go b/client/network/clientset/versioned/clientset.go index 4a16b0d..3b1062a 100644 --- a/client/network/clientset/versioned/clientset.go +++ b/client/network/clientset/versioned/clientset.go @@ -19,8 +19,8 @@ limitations under the License. package versioned import ( - "fmt" - "net/http" + fmt "fmt" + http "net/http" networkingv1 "github.com/GoogleCloudPlatform/gke-networking-api/client/network/clientset/versioned/typed/network/v1" discovery "k8s.io/client-go/discovery" diff --git a/client/network/clientset/versioned/typed/network/v1/fake/fake_gkenetworkparamset.go b/client/network/clientset/versioned/typed/network/v1/fake/fake_gkenetworkparamset.go index 83d221a..fb06870 100644 --- a/client/network/clientset/versioned/typed/network/v1/fake/fake_gkenetworkparamset.go +++ b/client/network/clientset/versioned/typed/network/v1/fake/fake_gkenetworkparamset.go @@ -19,120 +19,34 @@ limitations under the License. package fake import ( - "context" - v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + networkv1 "github.com/GoogleCloudPlatform/gke-networking-api/client/network/clientset/versioned/typed/network/v1" + gentype "k8s.io/client-go/gentype" ) -// FakeGKENetworkParamSets implements GKENetworkParamSetInterface -type FakeGKENetworkParamSets struct { +// fakeGKENetworkParamSets implements GKENetworkParamSetInterface +type fakeGKENetworkParamSets struct { + *gentype.FakeClientWithList[*v1.GKENetworkParamSet, *v1.GKENetworkParamSetList] Fake *FakeNetworkingV1 } -var gkenetworkparamsetsResource = v1.SchemeGroupVersion.WithResource("gkenetworkparamsets") - -var gkenetworkparamsetsKind = v1.SchemeGroupVersion.WithKind("GKENetworkParamSet") - -// Get takes name of the gKENetworkParamSet, and returns the corresponding gKENetworkParamSet object, and an error if there is any. -func (c *FakeGKENetworkParamSets) Get(ctx context.Context, name string, options metav1.GetOptions) (result *v1.GKENetworkParamSet, err error) { - emptyResult := &v1.GKENetworkParamSet{} - obj, err := c.Fake. - Invokes(testing.NewRootGetActionWithOptions(gkenetworkparamsetsResource, name, options), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GKENetworkParamSet), err -} - -// List takes label and field selectors, and returns the list of GKENetworkParamSets that match those selectors. -func (c *FakeGKENetworkParamSets) List(ctx context.Context, opts metav1.ListOptions) (result *v1.GKENetworkParamSetList, err error) { - emptyResult := &v1.GKENetworkParamSetList{} - obj, err := c.Fake. - Invokes(testing.NewRootListActionWithOptions(gkenetworkparamsetsResource, gkenetworkparamsetsKind, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1.GKENetworkParamSetList{ListMeta: obj.(*v1.GKENetworkParamSetList).ListMeta} - for _, item := range obj.(*v1.GKENetworkParamSetList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested gKENetworkParamSets. -func (c *FakeGKENetworkParamSets) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchActionWithOptions(gkenetworkparamsetsResource, opts)) -} - -// Create takes the representation of a gKENetworkParamSet and creates it. Returns the server's representation of the gKENetworkParamSet, and an error, if there is any. -func (c *FakeGKENetworkParamSets) Create(ctx context.Context, gKENetworkParamSet *v1.GKENetworkParamSet, opts metav1.CreateOptions) (result *v1.GKENetworkParamSet, err error) { - emptyResult := &v1.GKENetworkParamSet{} - obj, err := c.Fake. - Invokes(testing.NewRootCreateActionWithOptions(gkenetworkparamsetsResource, gKENetworkParamSet, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GKENetworkParamSet), err -} - -// Update takes the representation of a gKENetworkParamSet and updates it. Returns the server's representation of the gKENetworkParamSet, and an error, if there is any. -func (c *FakeGKENetworkParamSets) Update(ctx context.Context, gKENetworkParamSet *v1.GKENetworkParamSet, opts metav1.UpdateOptions) (result *v1.GKENetworkParamSet, err error) { - emptyResult := &v1.GKENetworkParamSet{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateActionWithOptions(gkenetworkparamsetsResource, gKENetworkParamSet, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GKENetworkParamSet), err -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeGKENetworkParamSets) UpdateStatus(ctx context.Context, gKENetworkParamSet *v1.GKENetworkParamSet, opts metav1.UpdateOptions) (result *v1.GKENetworkParamSet, err error) { - emptyResult := &v1.GKENetworkParamSet{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateSubresourceActionWithOptions(gkenetworkparamsetsResource, "status", gKENetworkParamSet, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GKENetworkParamSet), err -} - -// Delete takes name of the gKENetworkParamSet and deletes it. Returns an error if one occurs. -func (c *FakeGKENetworkParamSets) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteActionWithOptions(gkenetworkparamsetsResource, name, opts), &v1.GKENetworkParamSet{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeGKENetworkParamSets) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error { - action := testing.NewRootDeleteCollectionActionWithOptions(gkenetworkparamsetsResource, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1.GKENetworkParamSetList{}) - return err -} - -// Patch applies the patch and returns the patched gKENetworkParamSet. -func (c *FakeGKENetworkParamSets) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.GKENetworkParamSet, err error) { - emptyResult := &v1.GKENetworkParamSet{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(gkenetworkparamsetsResource, name, pt, data, opts, subresources...), emptyResult) - if obj == nil { - return emptyResult, err +func newFakeGKENetworkParamSets(fake *FakeNetworkingV1) networkv1.GKENetworkParamSetInterface { + return &fakeGKENetworkParamSets{ + gentype.NewFakeClientWithList[*v1.GKENetworkParamSet, *v1.GKENetworkParamSetList]( + fake.Fake, + "", + v1.SchemeGroupVersion.WithResource("gkenetworkparamsets"), + v1.SchemeGroupVersion.WithKind("GKENetworkParamSet"), + func() *v1.GKENetworkParamSet { return &v1.GKENetworkParamSet{} }, + func() *v1.GKENetworkParamSetList { return &v1.GKENetworkParamSetList{} }, + func(dst, src *v1.GKENetworkParamSetList) { dst.ListMeta = src.ListMeta }, + func(list *v1.GKENetworkParamSetList) []*v1.GKENetworkParamSet { + return gentype.ToPointerSlice(list.Items) + }, + func(list *v1.GKENetworkParamSetList, items []*v1.GKENetworkParamSet) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1.GKENetworkParamSet), err } diff --git a/client/network/clientset/versioned/typed/network/v1/fake/fake_network.go b/client/network/clientset/versioned/typed/network/v1/fake/fake_network.go index df11cf8..7c736c6 100644 --- a/client/network/clientset/versioned/typed/network/v1/fake/fake_network.go +++ b/client/network/clientset/versioned/typed/network/v1/fake/fake_network.go @@ -19,120 +19,30 @@ limitations under the License. package fake import ( - "context" - v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + networkv1 "github.com/GoogleCloudPlatform/gke-networking-api/client/network/clientset/versioned/typed/network/v1" + gentype "k8s.io/client-go/gentype" ) -// FakeNetworks implements NetworkInterface -type FakeNetworks struct { +// fakeNetworks implements NetworkInterface +type fakeNetworks struct { + *gentype.FakeClientWithList[*v1.Network, *v1.NetworkList] Fake *FakeNetworkingV1 } -var networksResource = v1.SchemeGroupVersion.WithResource("networks") - -var networksKind = v1.SchemeGroupVersion.WithKind("Network") - -// Get takes name of the network, and returns the corresponding network object, and an error if there is any. -func (c *FakeNetworks) Get(ctx context.Context, name string, options metav1.GetOptions) (result *v1.Network, err error) { - emptyResult := &v1.Network{} - obj, err := c.Fake. - Invokes(testing.NewRootGetActionWithOptions(networksResource, name, options), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Network), err -} - -// List takes label and field selectors, and returns the list of Networks that match those selectors. -func (c *FakeNetworks) List(ctx context.Context, opts metav1.ListOptions) (result *v1.NetworkList, err error) { - emptyResult := &v1.NetworkList{} - obj, err := c.Fake. - Invokes(testing.NewRootListActionWithOptions(networksResource, networksKind, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1.NetworkList{ListMeta: obj.(*v1.NetworkList).ListMeta} - for _, item := range obj.(*v1.NetworkList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested networks. -func (c *FakeNetworks) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchActionWithOptions(networksResource, opts)) -} - -// Create takes the representation of a network and creates it. Returns the server's representation of the network, and an error, if there is any. -func (c *FakeNetworks) Create(ctx context.Context, network *v1.Network, opts metav1.CreateOptions) (result *v1.Network, err error) { - emptyResult := &v1.Network{} - obj, err := c.Fake. - Invokes(testing.NewRootCreateActionWithOptions(networksResource, network, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Network), err -} - -// Update takes the representation of a network and updates it. Returns the server's representation of the network, and an error, if there is any. -func (c *FakeNetworks) Update(ctx context.Context, network *v1.Network, opts metav1.UpdateOptions) (result *v1.Network, err error) { - emptyResult := &v1.Network{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateActionWithOptions(networksResource, network, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Network), err -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeNetworks) UpdateStatus(ctx context.Context, network *v1.Network, opts metav1.UpdateOptions) (result *v1.Network, err error) { - emptyResult := &v1.Network{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateSubresourceActionWithOptions(networksResource, "status", network, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Network), err -} - -// Delete takes name of the network and deletes it. Returns an error if one occurs. -func (c *FakeNetworks) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteActionWithOptions(networksResource, name, opts), &v1.Network{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeNetworks) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error { - action := testing.NewRootDeleteCollectionActionWithOptions(networksResource, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1.NetworkList{}) - return err -} - -// Patch applies the patch and returns the patched network. -func (c *FakeNetworks) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.Network, err error) { - emptyResult := &v1.Network{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(networksResource, name, pt, data, opts, subresources...), emptyResult) - if obj == nil { - return emptyResult, err +func newFakeNetworks(fake *FakeNetworkingV1) networkv1.NetworkInterface { + return &fakeNetworks{ + gentype.NewFakeClientWithList[*v1.Network, *v1.NetworkList]( + fake.Fake, + "", + v1.SchemeGroupVersion.WithResource("networks"), + v1.SchemeGroupVersion.WithKind("Network"), + func() *v1.Network { return &v1.Network{} }, + func() *v1.NetworkList { return &v1.NetworkList{} }, + func(dst, src *v1.NetworkList) { dst.ListMeta = src.ListMeta }, + func(list *v1.NetworkList) []*v1.Network { return gentype.ToPointerSlice(list.Items) }, + func(list *v1.NetworkList, items []*v1.Network) { list.Items = gentype.FromPointerSlice(items) }, + ), + fake, } - return obj.(*v1.Network), err } diff --git a/client/network/clientset/versioned/typed/network/v1/fake/fake_network_client.go b/client/network/clientset/versioned/typed/network/v1/fake/fake_network_client.go index 28fa34f..88b3bf9 100644 --- a/client/network/clientset/versioned/typed/network/v1/fake/fake_network_client.go +++ b/client/network/clientset/versioned/typed/network/v1/fake/fake_network_client.go @@ -29,19 +29,19 @@ type FakeNetworkingV1 struct { } func (c *FakeNetworkingV1) GKENetworkParamSets() v1.GKENetworkParamSetInterface { - return &FakeGKENetworkParamSets{c} + return newFakeGKENetworkParamSets(c) } func (c *FakeNetworkingV1) Networks() v1.NetworkInterface { - return &FakeNetworks{c} + return newFakeNetworks(c) } func (c *FakeNetworkingV1) NetworkInterfaces(namespace string) v1.NetworkInterfaceInterface { - return &FakeNetworkInterfaces{c, namespace} + return newFakeNetworkInterfaces(c, namespace) } func (c *FakeNetworkingV1) Subnetworks() v1.SubnetworkInterface { - return &FakeSubnetworks{c} + return newFakeSubnetworks(c) } // RESTClient returns a RESTClient that is used to communicate diff --git a/client/network/clientset/versioned/typed/network/v1/fake/fake_networkinterface.go b/client/network/clientset/versioned/typed/network/v1/fake/fake_networkinterface.go index 52ebf30..3b686e9 100644 --- a/client/network/clientset/versioned/typed/network/v1/fake/fake_networkinterface.go +++ b/client/network/clientset/versioned/typed/network/v1/fake/fake_networkinterface.go @@ -19,129 +19,32 @@ limitations under the License. package fake import ( - "context" - v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + networkv1 "github.com/GoogleCloudPlatform/gke-networking-api/client/network/clientset/versioned/typed/network/v1" + gentype "k8s.io/client-go/gentype" ) -// FakeNetworkInterfaces implements NetworkInterfaceInterface -type FakeNetworkInterfaces struct { +// fakeNetworkInterfaces implements NetworkInterfaceInterface +type fakeNetworkInterfaces struct { + *gentype.FakeClientWithList[*v1.NetworkInterface, *v1.NetworkInterfaceList] Fake *FakeNetworkingV1 - ns string -} - -var networkinterfacesResource = v1.SchemeGroupVersion.WithResource("networkinterfaces") - -var networkinterfacesKind = v1.SchemeGroupVersion.WithKind("NetworkInterface") - -// Get takes name of the networkInterface, and returns the corresponding networkInterface object, and an error if there is any. -func (c *FakeNetworkInterfaces) Get(ctx context.Context, name string, options metav1.GetOptions) (result *v1.NetworkInterface, err error) { - emptyResult := &v1.NetworkInterface{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(networkinterfacesResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.NetworkInterface), err -} - -// List takes label and field selectors, and returns the list of NetworkInterfaces that match those selectors. -func (c *FakeNetworkInterfaces) List(ctx context.Context, opts metav1.ListOptions) (result *v1.NetworkInterfaceList, err error) { - emptyResult := &v1.NetworkInterfaceList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(networkinterfacesResource, networkinterfacesKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1.NetworkInterfaceList{ListMeta: obj.(*v1.NetworkInterfaceList).ListMeta} - for _, item := range obj.(*v1.NetworkInterfaceList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested networkInterfaces. -func (c *FakeNetworkInterfaces) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(networkinterfacesResource, c.ns, opts)) - -} - -// Create takes the representation of a networkInterface and creates it. Returns the server's representation of the networkInterface, and an error, if there is any. -func (c *FakeNetworkInterfaces) Create(ctx context.Context, networkInterface *v1.NetworkInterface, opts metav1.CreateOptions) (result *v1.NetworkInterface, err error) { - emptyResult := &v1.NetworkInterface{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(networkinterfacesResource, c.ns, networkInterface, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.NetworkInterface), err -} - -// Update takes the representation of a networkInterface and updates it. Returns the server's representation of the networkInterface, and an error, if there is any. -func (c *FakeNetworkInterfaces) Update(ctx context.Context, networkInterface *v1.NetworkInterface, opts metav1.UpdateOptions) (result *v1.NetworkInterface, err error) { - emptyResult := &v1.NetworkInterface{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(networkinterfacesResource, c.ns, networkInterface, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.NetworkInterface), err -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeNetworkInterfaces) UpdateStatus(ctx context.Context, networkInterface *v1.NetworkInterface, opts metav1.UpdateOptions) (result *v1.NetworkInterface, err error) { - emptyResult := &v1.NetworkInterface{} - obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceActionWithOptions(networkinterfacesResource, "status", c.ns, networkInterface, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.NetworkInterface), err -} - -// Delete takes name of the networkInterface and deletes it. Returns an error if one occurs. -func (c *FakeNetworkInterfaces) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(networkinterfacesResource, c.ns, name, opts), &v1.NetworkInterface{}) - - return err } -// DeleteCollection deletes a collection of objects. -func (c *FakeNetworkInterfaces) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(networkinterfacesResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1.NetworkInterfaceList{}) - return err -} - -// Patch applies the patch and returns the patched networkInterface. -func (c *FakeNetworkInterfaces) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.NetworkInterface, err error) { - emptyResult := &v1.NetworkInterface{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(networkinterfacesResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeNetworkInterfaces(fake *FakeNetworkingV1, namespace string) networkv1.NetworkInterfaceInterface { + return &fakeNetworkInterfaces{ + gentype.NewFakeClientWithList[*v1.NetworkInterface, *v1.NetworkInterfaceList]( + fake.Fake, + namespace, + v1.SchemeGroupVersion.WithResource("networkinterfaces"), + v1.SchemeGroupVersion.WithKind("NetworkInterface"), + func() *v1.NetworkInterface { return &v1.NetworkInterface{} }, + func() *v1.NetworkInterfaceList { return &v1.NetworkInterfaceList{} }, + func(dst, src *v1.NetworkInterfaceList) { dst.ListMeta = src.ListMeta }, + func(list *v1.NetworkInterfaceList) []*v1.NetworkInterface { return gentype.ToPointerSlice(list.Items) }, + func(list *v1.NetworkInterfaceList, items []*v1.NetworkInterface) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1.NetworkInterface), err } diff --git a/client/network/clientset/versioned/typed/network/v1/fake/fake_subnetwork.go b/client/network/clientset/versioned/typed/network/v1/fake/fake_subnetwork.go index e2bfae8..0d60c09 100644 --- a/client/network/clientset/versioned/typed/network/v1/fake/fake_subnetwork.go +++ b/client/network/clientset/versioned/typed/network/v1/fake/fake_subnetwork.go @@ -19,120 +19,30 @@ limitations under the License. package fake import ( - "context" - v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + networkv1 "github.com/GoogleCloudPlatform/gke-networking-api/client/network/clientset/versioned/typed/network/v1" + gentype "k8s.io/client-go/gentype" ) -// FakeSubnetworks implements SubnetworkInterface -type FakeSubnetworks struct { +// fakeSubnetworks implements SubnetworkInterface +type fakeSubnetworks struct { + *gentype.FakeClientWithList[*v1.Subnetwork, *v1.SubnetworkList] Fake *FakeNetworkingV1 } -var subnetworksResource = v1.SchemeGroupVersion.WithResource("subnetworks") - -var subnetworksKind = v1.SchemeGroupVersion.WithKind("Subnetwork") - -// Get takes name of the subnetwork, and returns the corresponding subnetwork object, and an error if there is any. -func (c *FakeSubnetworks) Get(ctx context.Context, name string, options metav1.GetOptions) (result *v1.Subnetwork, err error) { - emptyResult := &v1.Subnetwork{} - obj, err := c.Fake. - Invokes(testing.NewRootGetActionWithOptions(subnetworksResource, name, options), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Subnetwork), err -} - -// List takes label and field selectors, and returns the list of Subnetworks that match those selectors. -func (c *FakeSubnetworks) List(ctx context.Context, opts metav1.ListOptions) (result *v1.SubnetworkList, err error) { - emptyResult := &v1.SubnetworkList{} - obj, err := c.Fake. - Invokes(testing.NewRootListActionWithOptions(subnetworksResource, subnetworksKind, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1.SubnetworkList{ListMeta: obj.(*v1.SubnetworkList).ListMeta} - for _, item := range obj.(*v1.SubnetworkList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested subnetworks. -func (c *FakeSubnetworks) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchActionWithOptions(subnetworksResource, opts)) -} - -// Create takes the representation of a subnetwork and creates it. Returns the server's representation of the subnetwork, and an error, if there is any. -func (c *FakeSubnetworks) Create(ctx context.Context, subnetwork *v1.Subnetwork, opts metav1.CreateOptions) (result *v1.Subnetwork, err error) { - emptyResult := &v1.Subnetwork{} - obj, err := c.Fake. - Invokes(testing.NewRootCreateActionWithOptions(subnetworksResource, subnetwork, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Subnetwork), err -} - -// Update takes the representation of a subnetwork and updates it. Returns the server's representation of the subnetwork, and an error, if there is any. -func (c *FakeSubnetworks) Update(ctx context.Context, subnetwork *v1.Subnetwork, opts metav1.UpdateOptions) (result *v1.Subnetwork, err error) { - emptyResult := &v1.Subnetwork{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateActionWithOptions(subnetworksResource, subnetwork, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Subnetwork), err -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeSubnetworks) UpdateStatus(ctx context.Context, subnetwork *v1.Subnetwork, opts metav1.UpdateOptions) (result *v1.Subnetwork, err error) { - emptyResult := &v1.Subnetwork{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateSubresourceActionWithOptions(subnetworksResource, "status", subnetwork, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Subnetwork), err -} - -// Delete takes name of the subnetwork and deletes it. Returns an error if one occurs. -func (c *FakeSubnetworks) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteActionWithOptions(subnetworksResource, name, opts), &v1.Subnetwork{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeSubnetworks) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error { - action := testing.NewRootDeleteCollectionActionWithOptions(subnetworksResource, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1.SubnetworkList{}) - return err -} - -// Patch applies the patch and returns the patched subnetwork. -func (c *FakeSubnetworks) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.Subnetwork, err error) { - emptyResult := &v1.Subnetwork{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(subnetworksResource, name, pt, data, opts, subresources...), emptyResult) - if obj == nil { - return emptyResult, err +func newFakeSubnetworks(fake *FakeNetworkingV1) networkv1.SubnetworkInterface { + return &fakeSubnetworks{ + gentype.NewFakeClientWithList[*v1.Subnetwork, *v1.SubnetworkList]( + fake.Fake, + "", + v1.SchemeGroupVersion.WithResource("subnetworks"), + v1.SchemeGroupVersion.WithKind("Subnetwork"), + func() *v1.Subnetwork { return &v1.Subnetwork{} }, + func() *v1.SubnetworkList { return &v1.SubnetworkList{} }, + func(dst, src *v1.SubnetworkList) { dst.ListMeta = src.ListMeta }, + func(list *v1.SubnetworkList) []*v1.Subnetwork { return gentype.ToPointerSlice(list.Items) }, + func(list *v1.SubnetworkList, items []*v1.Subnetwork) { list.Items = gentype.FromPointerSlice(items) }, + ), + fake, } - return obj.(*v1.Subnetwork), err } diff --git a/client/network/clientset/versioned/typed/network/v1/gkenetworkparamset.go b/client/network/clientset/versioned/typed/network/v1/gkenetworkparamset.go index e7fcd3f..c2b7f85 100644 --- a/client/network/clientset/versioned/typed/network/v1/gkenetworkparamset.go +++ b/client/network/clientset/versioned/typed/network/v1/gkenetworkparamset.go @@ -19,9 +19,9 @@ limitations under the License. package v1 import ( - "context" + context "context" - v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" + networkv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" scheme "github.com/GoogleCloudPlatform/gke-networking-api/client/network/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -37,33 +37,34 @@ type GKENetworkParamSetsGetter interface { // GKENetworkParamSetInterface has methods to work with GKENetworkParamSet resources. type GKENetworkParamSetInterface interface { - Create(ctx context.Context, gKENetworkParamSet *v1.GKENetworkParamSet, opts metav1.CreateOptions) (*v1.GKENetworkParamSet, error) - Update(ctx context.Context, gKENetworkParamSet *v1.GKENetworkParamSet, opts metav1.UpdateOptions) (*v1.GKENetworkParamSet, error) + Create(ctx context.Context, gKENetworkParamSet *networkv1.GKENetworkParamSet, opts metav1.CreateOptions) (*networkv1.GKENetworkParamSet, error) + Update(ctx context.Context, gKENetworkParamSet *networkv1.GKENetworkParamSet, opts metav1.UpdateOptions) (*networkv1.GKENetworkParamSet, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, gKENetworkParamSet *v1.GKENetworkParamSet, opts metav1.UpdateOptions) (*v1.GKENetworkParamSet, error) + UpdateStatus(ctx context.Context, gKENetworkParamSet *networkv1.GKENetworkParamSet, opts metav1.UpdateOptions) (*networkv1.GKENetworkParamSet, error) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error - Get(ctx context.Context, name string, opts metav1.GetOptions) (*v1.GKENetworkParamSet, error) - List(ctx context.Context, opts metav1.ListOptions) (*v1.GKENetworkParamSetList, error) + Get(ctx context.Context, name string, opts metav1.GetOptions) (*networkv1.GKENetworkParamSet, error) + List(ctx context.Context, opts metav1.ListOptions) (*networkv1.GKENetworkParamSetList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.GKENetworkParamSet, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *networkv1.GKENetworkParamSet, err error) GKENetworkParamSetExpansion } // gKENetworkParamSets implements GKENetworkParamSetInterface type gKENetworkParamSets struct { - *gentype.ClientWithList[*v1.GKENetworkParamSet, *v1.GKENetworkParamSetList] + *gentype.ClientWithList[*networkv1.GKENetworkParamSet, *networkv1.GKENetworkParamSetList] } // newGKENetworkParamSets returns a GKENetworkParamSets func newGKENetworkParamSets(c *NetworkingV1Client) *gKENetworkParamSets { return &gKENetworkParamSets{ - gentype.NewClientWithList[*v1.GKENetworkParamSet, *v1.GKENetworkParamSetList]( + gentype.NewClientWithList[*networkv1.GKENetworkParamSet, *networkv1.GKENetworkParamSetList]( "gkenetworkparamsets", c.RESTClient(), scheme.ParameterCodec, "", - func() *v1.GKENetworkParamSet { return &v1.GKENetworkParamSet{} }, - func() *v1.GKENetworkParamSetList { return &v1.GKENetworkParamSetList{} }), + func() *networkv1.GKENetworkParamSet { return &networkv1.GKENetworkParamSet{} }, + func() *networkv1.GKENetworkParamSetList { return &networkv1.GKENetworkParamSetList{} }, + ), } } diff --git a/client/network/clientset/versioned/typed/network/v1/network.go b/client/network/clientset/versioned/typed/network/v1/network.go index 97af745..5ed711f 100644 --- a/client/network/clientset/versioned/typed/network/v1/network.go +++ b/client/network/clientset/versioned/typed/network/v1/network.go @@ -19,9 +19,9 @@ limitations under the License. package v1 import ( - "context" + context "context" - v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" + networkv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" scheme "github.com/GoogleCloudPlatform/gke-networking-api/client/network/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -37,33 +37,34 @@ type NetworksGetter interface { // NetworkInterface has methods to work with Network resources. type NetworkInterface interface { - Create(ctx context.Context, network *v1.Network, opts metav1.CreateOptions) (*v1.Network, error) - Update(ctx context.Context, network *v1.Network, opts metav1.UpdateOptions) (*v1.Network, error) + Create(ctx context.Context, network *networkv1.Network, opts metav1.CreateOptions) (*networkv1.Network, error) + Update(ctx context.Context, network *networkv1.Network, opts metav1.UpdateOptions) (*networkv1.Network, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, network *v1.Network, opts metav1.UpdateOptions) (*v1.Network, error) + UpdateStatus(ctx context.Context, network *networkv1.Network, opts metav1.UpdateOptions) (*networkv1.Network, error) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error - Get(ctx context.Context, name string, opts metav1.GetOptions) (*v1.Network, error) - List(ctx context.Context, opts metav1.ListOptions) (*v1.NetworkList, error) + Get(ctx context.Context, name string, opts metav1.GetOptions) (*networkv1.Network, error) + List(ctx context.Context, opts metav1.ListOptions) (*networkv1.NetworkList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.Network, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *networkv1.Network, err error) NetworkExpansion } // networks implements NetworkInterface type networks struct { - *gentype.ClientWithList[*v1.Network, *v1.NetworkList] + *gentype.ClientWithList[*networkv1.Network, *networkv1.NetworkList] } // newNetworks returns a Networks func newNetworks(c *NetworkingV1Client) *networks { return &networks{ - gentype.NewClientWithList[*v1.Network, *v1.NetworkList]( + gentype.NewClientWithList[*networkv1.Network, *networkv1.NetworkList]( "networks", c.RESTClient(), scheme.ParameterCodec, "", - func() *v1.Network { return &v1.Network{} }, - func() *v1.NetworkList { return &v1.NetworkList{} }), + func() *networkv1.Network { return &networkv1.Network{} }, + func() *networkv1.NetworkList { return &networkv1.NetworkList{} }, + ), } } diff --git a/client/network/clientset/versioned/typed/network/v1/network_client.go b/client/network/clientset/versioned/typed/network/v1/network_client.go index 0665e7c..6686171 100644 --- a/client/network/clientset/versioned/typed/network/v1/network_client.go +++ b/client/network/clientset/versioned/typed/network/v1/network_client.go @@ -19,10 +19,10 @@ limitations under the License. package v1 import ( - "net/http" + http "net/http" - v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" - "github.com/GoogleCloudPlatform/gke-networking-api/client/network/clientset/versioned/scheme" + networkv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" + scheme "github.com/GoogleCloudPlatform/gke-networking-api/client/network/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) @@ -100,10 +100,10 @@ func New(c rest.Interface) *NetworkingV1Client { } func setConfigDefaults(config *rest.Config) error { - gv := v1.SchemeGroupVersion + gv := networkv1.SchemeGroupVersion config.GroupVersion = &gv config.APIPath = "/apis" - config.NegotiatedSerializer = scheme.Codecs.WithoutConversion() + config.NegotiatedSerializer = rest.CodecFactoryForGeneratedClient(scheme.Scheme, scheme.Codecs).WithoutConversion() if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() diff --git a/client/network/clientset/versioned/typed/network/v1/networkinterface.go b/client/network/clientset/versioned/typed/network/v1/networkinterface.go index 5ce6cd4..d593a54 100644 --- a/client/network/clientset/versioned/typed/network/v1/networkinterface.go +++ b/client/network/clientset/versioned/typed/network/v1/networkinterface.go @@ -19,9 +19,9 @@ limitations under the License. package v1 import ( - "context" + context "context" - v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" + networkv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" scheme "github.com/GoogleCloudPlatform/gke-networking-api/client/network/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -37,33 +37,34 @@ type NetworkInterfacesGetter interface { // NetworkInterfaceInterface has methods to work with NetworkInterface resources. type NetworkInterfaceInterface interface { - Create(ctx context.Context, networkInterface *v1.NetworkInterface, opts metav1.CreateOptions) (*v1.NetworkInterface, error) - Update(ctx context.Context, networkInterface *v1.NetworkInterface, opts metav1.UpdateOptions) (*v1.NetworkInterface, error) + Create(ctx context.Context, networkInterface *networkv1.NetworkInterface, opts metav1.CreateOptions) (*networkv1.NetworkInterface, error) + Update(ctx context.Context, networkInterface *networkv1.NetworkInterface, opts metav1.UpdateOptions) (*networkv1.NetworkInterface, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, networkInterface *v1.NetworkInterface, opts metav1.UpdateOptions) (*v1.NetworkInterface, error) + UpdateStatus(ctx context.Context, networkInterface *networkv1.NetworkInterface, opts metav1.UpdateOptions) (*networkv1.NetworkInterface, error) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error - Get(ctx context.Context, name string, opts metav1.GetOptions) (*v1.NetworkInterface, error) - List(ctx context.Context, opts metav1.ListOptions) (*v1.NetworkInterfaceList, error) + Get(ctx context.Context, name string, opts metav1.GetOptions) (*networkv1.NetworkInterface, error) + List(ctx context.Context, opts metav1.ListOptions) (*networkv1.NetworkInterfaceList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.NetworkInterface, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *networkv1.NetworkInterface, err error) NetworkInterfaceExpansion } // networkInterfaces implements NetworkInterfaceInterface type networkInterfaces struct { - *gentype.ClientWithList[*v1.NetworkInterface, *v1.NetworkInterfaceList] + *gentype.ClientWithList[*networkv1.NetworkInterface, *networkv1.NetworkInterfaceList] } // newNetworkInterfaces returns a NetworkInterfaces func newNetworkInterfaces(c *NetworkingV1Client, namespace string) *networkInterfaces { return &networkInterfaces{ - gentype.NewClientWithList[*v1.NetworkInterface, *v1.NetworkInterfaceList]( + gentype.NewClientWithList[*networkv1.NetworkInterface, *networkv1.NetworkInterfaceList]( "networkinterfaces", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1.NetworkInterface { return &v1.NetworkInterface{} }, - func() *v1.NetworkInterfaceList { return &v1.NetworkInterfaceList{} }), + func() *networkv1.NetworkInterface { return &networkv1.NetworkInterface{} }, + func() *networkv1.NetworkInterfaceList { return &networkv1.NetworkInterfaceList{} }, + ), } } diff --git a/client/network/clientset/versioned/typed/network/v1/subnetwork.go b/client/network/clientset/versioned/typed/network/v1/subnetwork.go index 3c9f8f9..9f2b37a 100644 --- a/client/network/clientset/versioned/typed/network/v1/subnetwork.go +++ b/client/network/clientset/versioned/typed/network/v1/subnetwork.go @@ -19,9 +19,9 @@ limitations under the License. package v1 import ( - "context" + context "context" - v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" + networkv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" scheme "github.com/GoogleCloudPlatform/gke-networking-api/client/network/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -37,33 +37,34 @@ type SubnetworksGetter interface { // SubnetworkInterface has methods to work with Subnetwork resources. type SubnetworkInterface interface { - Create(ctx context.Context, subnetwork *v1.Subnetwork, opts metav1.CreateOptions) (*v1.Subnetwork, error) - Update(ctx context.Context, subnetwork *v1.Subnetwork, opts metav1.UpdateOptions) (*v1.Subnetwork, error) + Create(ctx context.Context, subnetwork *networkv1.Subnetwork, opts metav1.CreateOptions) (*networkv1.Subnetwork, error) + Update(ctx context.Context, subnetwork *networkv1.Subnetwork, opts metav1.UpdateOptions) (*networkv1.Subnetwork, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, subnetwork *v1.Subnetwork, opts metav1.UpdateOptions) (*v1.Subnetwork, error) + UpdateStatus(ctx context.Context, subnetwork *networkv1.Subnetwork, opts metav1.UpdateOptions) (*networkv1.Subnetwork, error) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error - Get(ctx context.Context, name string, opts metav1.GetOptions) (*v1.Subnetwork, error) - List(ctx context.Context, opts metav1.ListOptions) (*v1.SubnetworkList, error) + Get(ctx context.Context, name string, opts metav1.GetOptions) (*networkv1.Subnetwork, error) + List(ctx context.Context, opts metav1.ListOptions) (*networkv1.SubnetworkList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.Subnetwork, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *networkv1.Subnetwork, err error) SubnetworkExpansion } // subnetworks implements SubnetworkInterface type subnetworks struct { - *gentype.ClientWithList[*v1.Subnetwork, *v1.SubnetworkList] + *gentype.ClientWithList[*networkv1.Subnetwork, *networkv1.SubnetworkList] } // newSubnetworks returns a Subnetworks func newSubnetworks(c *NetworkingV1Client) *subnetworks { return &subnetworks{ - gentype.NewClientWithList[*v1.Subnetwork, *v1.SubnetworkList]( + gentype.NewClientWithList[*networkv1.Subnetwork, *networkv1.SubnetworkList]( "subnetworks", c.RESTClient(), scheme.ParameterCodec, "", - func() *v1.Subnetwork { return &v1.Subnetwork{} }, - func() *v1.SubnetworkList { return &v1.SubnetworkList{} }), + func() *networkv1.Subnetwork { return &networkv1.Subnetwork{} }, + func() *networkv1.SubnetworkList { return &networkv1.SubnetworkList{} }, + ), } } diff --git a/client/network/informers/externalversions/generic.go b/client/network/informers/externalversions/generic.go index 7d9caf1..a07c4a1 100644 --- a/client/network/informers/externalversions/generic.go +++ b/client/network/informers/externalversions/generic.go @@ -19,7 +19,7 @@ limitations under the License. package externalversions import ( - "fmt" + fmt "fmt" v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/client/network/informers/externalversions/network/v1/gkenetworkparamset.go b/client/network/informers/externalversions/network/v1/gkenetworkparamset.go index bd035be..b38eafc 100644 --- a/client/network/informers/externalversions/network/v1/gkenetworkparamset.go +++ b/client/network/informers/externalversions/network/v1/gkenetworkparamset.go @@ -19,13 +19,13 @@ limitations under the License. package v1 import ( - "context" + context "context" time "time" - networkv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" + apisnetworkv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" versioned "github.com/GoogleCloudPlatform/gke-networking-api/client/network/clientset/versioned" internalinterfaces "github.com/GoogleCloudPlatform/gke-networking-api/client/network/informers/externalversions/internalinterfaces" - v1 "github.com/GoogleCloudPlatform/gke-networking-api/client/network/listers/network/v1" + networkv1 "github.com/GoogleCloudPlatform/gke-networking-api/client/network/listers/network/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -36,7 +36,7 @@ import ( // GKENetworkParamSets. type GKENetworkParamSetInformer interface { Informer() cache.SharedIndexInformer - Lister() v1.GKENetworkParamSetLister + Lister() networkv1.GKENetworkParamSetLister } type gKENetworkParamSetInformer struct { @@ -70,7 +70,7 @@ func NewFilteredGKENetworkParamSetInformer(client versioned.Interface, resyncPer return client.NetworkingV1().GKENetworkParamSets().Watch(context.TODO(), options) }, }, - &networkv1.GKENetworkParamSet{}, + &apisnetworkv1.GKENetworkParamSet{}, resyncPeriod, indexers, ) @@ -81,9 +81,9 @@ func (f *gKENetworkParamSetInformer) defaultInformer(client versioned.Interface, } func (f *gKENetworkParamSetInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&networkv1.GKENetworkParamSet{}, f.defaultInformer) + return f.factory.InformerFor(&apisnetworkv1.GKENetworkParamSet{}, f.defaultInformer) } -func (f *gKENetworkParamSetInformer) Lister() v1.GKENetworkParamSetLister { - return v1.NewGKENetworkParamSetLister(f.Informer().GetIndexer()) +func (f *gKENetworkParamSetInformer) Lister() networkv1.GKENetworkParamSetLister { + return networkv1.NewGKENetworkParamSetLister(f.Informer().GetIndexer()) } diff --git a/client/network/informers/externalversions/network/v1/network.go b/client/network/informers/externalversions/network/v1/network.go index c4d60af..fdf19fe 100644 --- a/client/network/informers/externalversions/network/v1/network.go +++ b/client/network/informers/externalversions/network/v1/network.go @@ -19,13 +19,13 @@ limitations under the License. package v1 import ( - "context" + context "context" time "time" - networkv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" + apisnetworkv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" versioned "github.com/GoogleCloudPlatform/gke-networking-api/client/network/clientset/versioned" internalinterfaces "github.com/GoogleCloudPlatform/gke-networking-api/client/network/informers/externalversions/internalinterfaces" - v1 "github.com/GoogleCloudPlatform/gke-networking-api/client/network/listers/network/v1" + networkv1 "github.com/GoogleCloudPlatform/gke-networking-api/client/network/listers/network/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -36,7 +36,7 @@ import ( // Networks. type NetworkInformer interface { Informer() cache.SharedIndexInformer - Lister() v1.NetworkLister + Lister() networkv1.NetworkLister } type networkInformer struct { @@ -70,7 +70,7 @@ func NewFilteredNetworkInformer(client versioned.Interface, resyncPeriod time.Du return client.NetworkingV1().Networks().Watch(context.TODO(), options) }, }, - &networkv1.Network{}, + &apisnetworkv1.Network{}, resyncPeriod, indexers, ) @@ -81,9 +81,9 @@ func (f *networkInformer) defaultInformer(client versioned.Interface, resyncPeri } func (f *networkInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&networkv1.Network{}, f.defaultInformer) + return f.factory.InformerFor(&apisnetworkv1.Network{}, f.defaultInformer) } -func (f *networkInformer) Lister() v1.NetworkLister { - return v1.NewNetworkLister(f.Informer().GetIndexer()) +func (f *networkInformer) Lister() networkv1.NetworkLister { + return networkv1.NewNetworkLister(f.Informer().GetIndexer()) } diff --git a/client/network/informers/externalversions/network/v1/networkinterface.go b/client/network/informers/externalversions/network/v1/networkinterface.go index e64ca10..753e851 100644 --- a/client/network/informers/externalversions/network/v1/networkinterface.go +++ b/client/network/informers/externalversions/network/v1/networkinterface.go @@ -19,13 +19,13 @@ limitations under the License. package v1 import ( - "context" + context "context" time "time" - networkv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" + apisnetworkv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" versioned "github.com/GoogleCloudPlatform/gke-networking-api/client/network/clientset/versioned" internalinterfaces "github.com/GoogleCloudPlatform/gke-networking-api/client/network/informers/externalversions/internalinterfaces" - v1 "github.com/GoogleCloudPlatform/gke-networking-api/client/network/listers/network/v1" + networkv1 "github.com/GoogleCloudPlatform/gke-networking-api/client/network/listers/network/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -36,7 +36,7 @@ import ( // NetworkInterfaces. type NetworkInterfaceInformer interface { Informer() cache.SharedIndexInformer - Lister() v1.NetworkInterfaceLister + Lister() networkv1.NetworkInterfaceLister } type networkInterfaceInformer struct { @@ -71,7 +71,7 @@ func NewFilteredNetworkInterfaceInformer(client versioned.Interface, namespace s return client.NetworkingV1().NetworkInterfaces(namespace).Watch(context.TODO(), options) }, }, - &networkv1.NetworkInterface{}, + &apisnetworkv1.NetworkInterface{}, resyncPeriod, indexers, ) @@ -82,9 +82,9 @@ func (f *networkInterfaceInformer) defaultInformer(client versioned.Interface, r } func (f *networkInterfaceInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&networkv1.NetworkInterface{}, f.defaultInformer) + return f.factory.InformerFor(&apisnetworkv1.NetworkInterface{}, f.defaultInformer) } -func (f *networkInterfaceInformer) Lister() v1.NetworkInterfaceLister { - return v1.NewNetworkInterfaceLister(f.Informer().GetIndexer()) +func (f *networkInterfaceInformer) Lister() networkv1.NetworkInterfaceLister { + return networkv1.NewNetworkInterfaceLister(f.Informer().GetIndexer()) } diff --git a/client/network/informers/externalversions/network/v1/subnetwork.go b/client/network/informers/externalversions/network/v1/subnetwork.go index 24e299b..f5f0edd 100644 --- a/client/network/informers/externalversions/network/v1/subnetwork.go +++ b/client/network/informers/externalversions/network/v1/subnetwork.go @@ -19,13 +19,13 @@ limitations under the License. package v1 import ( - "context" + context "context" time "time" - networkv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" + apisnetworkv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" versioned "github.com/GoogleCloudPlatform/gke-networking-api/client/network/clientset/versioned" internalinterfaces "github.com/GoogleCloudPlatform/gke-networking-api/client/network/informers/externalversions/internalinterfaces" - v1 "github.com/GoogleCloudPlatform/gke-networking-api/client/network/listers/network/v1" + networkv1 "github.com/GoogleCloudPlatform/gke-networking-api/client/network/listers/network/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -36,7 +36,7 @@ import ( // Subnetworks. type SubnetworkInformer interface { Informer() cache.SharedIndexInformer - Lister() v1.SubnetworkLister + Lister() networkv1.SubnetworkLister } type subnetworkInformer struct { @@ -70,7 +70,7 @@ func NewFilteredSubnetworkInformer(client versioned.Interface, resyncPeriod time return client.NetworkingV1().Subnetworks().Watch(context.TODO(), options) }, }, - &networkv1.Subnetwork{}, + &apisnetworkv1.Subnetwork{}, resyncPeriod, indexers, ) @@ -81,9 +81,9 @@ func (f *subnetworkInformer) defaultInformer(client versioned.Interface, resyncP } func (f *subnetworkInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&networkv1.Subnetwork{}, f.defaultInformer) + return f.factory.InformerFor(&apisnetworkv1.Subnetwork{}, f.defaultInformer) } -func (f *subnetworkInformer) Lister() v1.SubnetworkLister { - return v1.NewSubnetworkLister(f.Informer().GetIndexer()) +func (f *subnetworkInformer) Lister() networkv1.SubnetworkLister { + return networkv1.NewSubnetworkLister(f.Informer().GetIndexer()) } diff --git a/client/network/listers/network/v1/gkenetworkparamset.go b/client/network/listers/network/v1/gkenetworkparamset.go index 24c5f4d..3728374 100644 --- a/client/network/listers/network/v1/gkenetworkparamset.go +++ b/client/network/listers/network/v1/gkenetworkparamset.go @@ -19,10 +19,10 @@ limitations under the License. package v1 import ( - v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" + networkv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" ) // GKENetworkParamSetLister helps list GKENetworkParamSets. @@ -30,19 +30,19 @@ import ( type GKENetworkParamSetLister interface { // List lists all GKENetworkParamSets in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.GKENetworkParamSet, err error) + List(selector labels.Selector) (ret []*networkv1.GKENetworkParamSet, err error) // Get retrieves the GKENetworkParamSet from the index for a given name. // Objects returned here must be treated as read-only. - Get(name string) (*v1.GKENetworkParamSet, error) + Get(name string) (*networkv1.GKENetworkParamSet, error) GKENetworkParamSetListerExpansion } // gKENetworkParamSetLister implements the GKENetworkParamSetLister interface. type gKENetworkParamSetLister struct { - listers.ResourceIndexer[*v1.GKENetworkParamSet] + listers.ResourceIndexer[*networkv1.GKENetworkParamSet] } // NewGKENetworkParamSetLister returns a new GKENetworkParamSetLister. func NewGKENetworkParamSetLister(indexer cache.Indexer) GKENetworkParamSetLister { - return &gKENetworkParamSetLister{listers.New[*v1.GKENetworkParamSet](indexer, v1.Resource("gkenetworkparamset"))} + return &gKENetworkParamSetLister{listers.New[*networkv1.GKENetworkParamSet](indexer, networkv1.Resource("gkenetworkparamset"))} } diff --git a/client/network/listers/network/v1/network.go b/client/network/listers/network/v1/network.go index b526f71..4f68110 100644 --- a/client/network/listers/network/v1/network.go +++ b/client/network/listers/network/v1/network.go @@ -19,10 +19,10 @@ limitations under the License. package v1 import ( - v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" + networkv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" ) // NetworkLister helps list Networks. @@ -30,19 +30,19 @@ import ( type NetworkLister interface { // List lists all Networks in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.Network, err error) + List(selector labels.Selector) (ret []*networkv1.Network, err error) // Get retrieves the Network from the index for a given name. // Objects returned here must be treated as read-only. - Get(name string) (*v1.Network, error) + Get(name string) (*networkv1.Network, error) NetworkListerExpansion } // networkLister implements the NetworkLister interface. type networkLister struct { - listers.ResourceIndexer[*v1.Network] + listers.ResourceIndexer[*networkv1.Network] } // NewNetworkLister returns a new NetworkLister. func NewNetworkLister(indexer cache.Indexer) NetworkLister { - return &networkLister{listers.New[*v1.Network](indexer, v1.Resource("network"))} + return &networkLister{listers.New[*networkv1.Network](indexer, networkv1.Resource("network"))} } diff --git a/client/network/listers/network/v1/networkinterface.go b/client/network/listers/network/v1/networkinterface.go index 983135d..3069f5a 100644 --- a/client/network/listers/network/v1/networkinterface.go +++ b/client/network/listers/network/v1/networkinterface.go @@ -19,10 +19,10 @@ limitations under the License. package v1 import ( - v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" + networkv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" ) // NetworkInterfaceLister helps list NetworkInterfaces. @@ -30,7 +30,7 @@ import ( type NetworkInterfaceLister interface { // List lists all NetworkInterfaces in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.NetworkInterface, err error) + List(selector labels.Selector) (ret []*networkv1.NetworkInterface, err error) // NetworkInterfaces returns an object that can list and get NetworkInterfaces. NetworkInterfaces(namespace string) NetworkInterfaceNamespaceLister NetworkInterfaceListerExpansion @@ -38,17 +38,17 @@ type NetworkInterfaceLister interface { // networkInterfaceLister implements the NetworkInterfaceLister interface. type networkInterfaceLister struct { - listers.ResourceIndexer[*v1.NetworkInterface] + listers.ResourceIndexer[*networkv1.NetworkInterface] } // NewNetworkInterfaceLister returns a new NetworkInterfaceLister. func NewNetworkInterfaceLister(indexer cache.Indexer) NetworkInterfaceLister { - return &networkInterfaceLister{listers.New[*v1.NetworkInterface](indexer, v1.Resource("networkinterface"))} + return &networkInterfaceLister{listers.New[*networkv1.NetworkInterface](indexer, networkv1.Resource("networkinterface"))} } // NetworkInterfaces returns an object that can list and get NetworkInterfaces. func (s *networkInterfaceLister) NetworkInterfaces(namespace string) NetworkInterfaceNamespaceLister { - return networkInterfaceNamespaceLister{listers.NewNamespaced[*v1.NetworkInterface](s.ResourceIndexer, namespace)} + return networkInterfaceNamespaceLister{listers.NewNamespaced[*networkv1.NetworkInterface](s.ResourceIndexer, namespace)} } // NetworkInterfaceNamespaceLister helps list and get NetworkInterfaces. @@ -56,15 +56,15 @@ func (s *networkInterfaceLister) NetworkInterfaces(namespace string) NetworkInte type NetworkInterfaceNamespaceLister interface { // List lists all NetworkInterfaces in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.NetworkInterface, err error) + List(selector labels.Selector) (ret []*networkv1.NetworkInterface, err error) // Get retrieves the NetworkInterface from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1.NetworkInterface, error) + Get(name string) (*networkv1.NetworkInterface, error) NetworkInterfaceNamespaceListerExpansion } // networkInterfaceNamespaceLister implements the NetworkInterfaceNamespaceLister // interface. type networkInterfaceNamespaceLister struct { - listers.ResourceIndexer[*v1.NetworkInterface] + listers.ResourceIndexer[*networkv1.NetworkInterface] } diff --git a/client/network/listers/network/v1/subnetwork.go b/client/network/listers/network/v1/subnetwork.go index f0d9b20..8edba77 100644 --- a/client/network/listers/network/v1/subnetwork.go +++ b/client/network/listers/network/v1/subnetwork.go @@ -19,10 +19,10 @@ limitations under the License. package v1 import ( - v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" + networkv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/network/v1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" ) // SubnetworkLister helps list Subnetworks. @@ -30,19 +30,19 @@ import ( type SubnetworkLister interface { // List lists all Subnetworks in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.Subnetwork, err error) + List(selector labels.Selector) (ret []*networkv1.Subnetwork, err error) // Get retrieves the Subnetwork from the index for a given name. // Objects returned here must be treated as read-only. - Get(name string) (*v1.Subnetwork, error) + Get(name string) (*networkv1.Subnetwork, error) SubnetworkListerExpansion } // subnetworkLister implements the SubnetworkLister interface. type subnetworkLister struct { - listers.ResourceIndexer[*v1.Subnetwork] + listers.ResourceIndexer[*networkv1.Subnetwork] } // NewSubnetworkLister returns a new SubnetworkLister. func NewSubnetworkLister(indexer cache.Indexer) SubnetworkLister { - return &subnetworkLister{listers.New[*v1.Subnetwork](indexer, v1.Resource("subnetwork"))} + return &subnetworkLister{listers.New[*networkv1.Subnetwork](indexer, networkv1.Resource("subnetwork"))} } diff --git a/client/nodetopology/clientset/versioned/clientset.go b/client/nodetopology/clientset/versioned/clientset.go index ed5dd6b..a902823 100644 --- a/client/nodetopology/clientset/versioned/clientset.go +++ b/client/nodetopology/clientset/versioned/clientset.go @@ -19,8 +19,8 @@ limitations under the License. package versioned import ( - "fmt" - "net/http" + fmt "fmt" + http "net/http" networkingv1 "github.com/GoogleCloudPlatform/gke-networking-api/client/nodetopology/clientset/versioned/typed/nodetopology/v1" discovery "k8s.io/client-go/discovery" diff --git a/client/nodetopology/clientset/versioned/typed/nodetopology/v1/fake/fake_nodetopology.go b/client/nodetopology/clientset/versioned/typed/nodetopology/v1/fake/fake_nodetopology.go index 1ab99e7..b75d660 100644 --- a/client/nodetopology/clientset/versioned/typed/nodetopology/v1/fake/fake_nodetopology.go +++ b/client/nodetopology/clientset/versioned/typed/nodetopology/v1/fake/fake_nodetopology.go @@ -19,120 +19,32 @@ limitations under the License. package fake import ( - "context" - v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/nodetopology/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + nodetopologyv1 "github.com/GoogleCloudPlatform/gke-networking-api/client/nodetopology/clientset/versioned/typed/nodetopology/v1" + gentype "k8s.io/client-go/gentype" ) -// FakeNodeTopologies implements NodeTopologyInterface -type FakeNodeTopologies struct { +// fakeNodeTopologies implements NodeTopologyInterface +type fakeNodeTopologies struct { + *gentype.FakeClientWithList[*v1.NodeTopology, *v1.NodeTopologyList] Fake *FakeNetworkingV1 } -var nodetopologiesResource = v1.SchemeGroupVersion.WithResource("nodetopologies") - -var nodetopologiesKind = v1.SchemeGroupVersion.WithKind("NodeTopology") - -// Get takes name of the nodeTopology, and returns the corresponding nodeTopology object, and an error if there is any. -func (c *FakeNodeTopologies) Get(ctx context.Context, name string, options metav1.GetOptions) (result *v1.NodeTopology, err error) { - emptyResult := &v1.NodeTopology{} - obj, err := c.Fake. - Invokes(testing.NewRootGetActionWithOptions(nodetopologiesResource, name, options), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.NodeTopology), err -} - -// List takes label and field selectors, and returns the list of NodeTopologies that match those selectors. -func (c *FakeNodeTopologies) List(ctx context.Context, opts metav1.ListOptions) (result *v1.NodeTopologyList, err error) { - emptyResult := &v1.NodeTopologyList{} - obj, err := c.Fake. - Invokes(testing.NewRootListActionWithOptions(nodetopologiesResource, nodetopologiesKind, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1.NodeTopologyList{ListMeta: obj.(*v1.NodeTopologyList).ListMeta} - for _, item := range obj.(*v1.NodeTopologyList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested nodeTopologies. -func (c *FakeNodeTopologies) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchActionWithOptions(nodetopologiesResource, opts)) -} - -// Create takes the representation of a nodeTopology and creates it. Returns the server's representation of the nodeTopology, and an error, if there is any. -func (c *FakeNodeTopologies) Create(ctx context.Context, nodeTopology *v1.NodeTopology, opts metav1.CreateOptions) (result *v1.NodeTopology, err error) { - emptyResult := &v1.NodeTopology{} - obj, err := c.Fake. - Invokes(testing.NewRootCreateActionWithOptions(nodetopologiesResource, nodeTopology, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.NodeTopology), err -} - -// Update takes the representation of a nodeTopology and updates it. Returns the server's representation of the nodeTopology, and an error, if there is any. -func (c *FakeNodeTopologies) Update(ctx context.Context, nodeTopology *v1.NodeTopology, opts metav1.UpdateOptions) (result *v1.NodeTopology, err error) { - emptyResult := &v1.NodeTopology{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateActionWithOptions(nodetopologiesResource, nodeTopology, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.NodeTopology), err -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeNodeTopologies) UpdateStatus(ctx context.Context, nodeTopology *v1.NodeTopology, opts metav1.UpdateOptions) (result *v1.NodeTopology, err error) { - emptyResult := &v1.NodeTopology{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateSubresourceActionWithOptions(nodetopologiesResource, "status", nodeTopology, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.NodeTopology), err -} - -// Delete takes name of the nodeTopology and deletes it. Returns an error if one occurs. -func (c *FakeNodeTopologies) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteActionWithOptions(nodetopologiesResource, name, opts), &v1.NodeTopology{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeNodeTopologies) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error { - action := testing.NewRootDeleteCollectionActionWithOptions(nodetopologiesResource, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1.NodeTopologyList{}) - return err -} - -// Patch applies the patch and returns the patched nodeTopology. -func (c *FakeNodeTopologies) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.NodeTopology, err error) { - emptyResult := &v1.NodeTopology{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(nodetopologiesResource, name, pt, data, opts, subresources...), emptyResult) - if obj == nil { - return emptyResult, err +func newFakeNodeTopologies(fake *FakeNetworkingV1) nodetopologyv1.NodeTopologyInterface { + return &fakeNodeTopologies{ + gentype.NewFakeClientWithList[*v1.NodeTopology, *v1.NodeTopologyList]( + fake.Fake, + "", + v1.SchemeGroupVersion.WithResource("nodetopologies"), + v1.SchemeGroupVersion.WithKind("NodeTopology"), + func() *v1.NodeTopology { return &v1.NodeTopology{} }, + func() *v1.NodeTopologyList { return &v1.NodeTopologyList{} }, + func(dst, src *v1.NodeTopologyList) { dst.ListMeta = src.ListMeta }, + func(list *v1.NodeTopologyList) []*v1.NodeTopology { return gentype.ToPointerSlice(list.Items) }, + func(list *v1.NodeTopologyList, items []*v1.NodeTopology) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1.NodeTopology), err } diff --git a/client/nodetopology/clientset/versioned/typed/nodetopology/v1/fake/fake_nodetopology_client.go b/client/nodetopology/clientset/versioned/typed/nodetopology/v1/fake/fake_nodetopology_client.go index 3c4754a..abf27d2 100644 --- a/client/nodetopology/clientset/versioned/typed/nodetopology/v1/fake/fake_nodetopology_client.go +++ b/client/nodetopology/clientset/versioned/typed/nodetopology/v1/fake/fake_nodetopology_client.go @@ -29,7 +29,7 @@ type FakeNetworkingV1 struct { } func (c *FakeNetworkingV1) NodeTopologies() v1.NodeTopologyInterface { - return &FakeNodeTopologies{c} + return newFakeNodeTopologies(c) } // RESTClient returns a RESTClient that is used to communicate diff --git a/client/nodetopology/clientset/versioned/typed/nodetopology/v1/nodetopology.go b/client/nodetopology/clientset/versioned/typed/nodetopology/v1/nodetopology.go index 80e41c9..4ef2024 100644 --- a/client/nodetopology/clientset/versioned/typed/nodetopology/v1/nodetopology.go +++ b/client/nodetopology/clientset/versioned/typed/nodetopology/v1/nodetopology.go @@ -19,9 +19,9 @@ limitations under the License. package v1 import ( - "context" + context "context" - v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/nodetopology/v1" + nodetopologyv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/nodetopology/v1" scheme "github.com/GoogleCloudPlatform/gke-networking-api/client/nodetopology/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -37,33 +37,34 @@ type NodeTopologiesGetter interface { // NodeTopologyInterface has methods to work with NodeTopology resources. type NodeTopologyInterface interface { - Create(ctx context.Context, nodeTopology *v1.NodeTopology, opts metav1.CreateOptions) (*v1.NodeTopology, error) - Update(ctx context.Context, nodeTopology *v1.NodeTopology, opts metav1.UpdateOptions) (*v1.NodeTopology, error) + Create(ctx context.Context, nodeTopology *nodetopologyv1.NodeTopology, opts metav1.CreateOptions) (*nodetopologyv1.NodeTopology, error) + Update(ctx context.Context, nodeTopology *nodetopologyv1.NodeTopology, opts metav1.UpdateOptions) (*nodetopologyv1.NodeTopology, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, nodeTopology *v1.NodeTopology, opts metav1.UpdateOptions) (*v1.NodeTopology, error) + UpdateStatus(ctx context.Context, nodeTopology *nodetopologyv1.NodeTopology, opts metav1.UpdateOptions) (*nodetopologyv1.NodeTopology, error) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error - Get(ctx context.Context, name string, opts metav1.GetOptions) (*v1.NodeTopology, error) - List(ctx context.Context, opts metav1.ListOptions) (*v1.NodeTopologyList, error) + Get(ctx context.Context, name string, opts metav1.GetOptions) (*nodetopologyv1.NodeTopology, error) + List(ctx context.Context, opts metav1.ListOptions) (*nodetopologyv1.NodeTopologyList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.NodeTopology, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *nodetopologyv1.NodeTopology, err error) NodeTopologyExpansion } // nodeTopologies implements NodeTopologyInterface type nodeTopologies struct { - *gentype.ClientWithList[*v1.NodeTopology, *v1.NodeTopologyList] + *gentype.ClientWithList[*nodetopologyv1.NodeTopology, *nodetopologyv1.NodeTopologyList] } // newNodeTopologies returns a NodeTopologies func newNodeTopologies(c *NetworkingV1Client) *nodeTopologies { return &nodeTopologies{ - gentype.NewClientWithList[*v1.NodeTopology, *v1.NodeTopologyList]( + gentype.NewClientWithList[*nodetopologyv1.NodeTopology, *nodetopologyv1.NodeTopologyList]( "nodetopologies", c.RESTClient(), scheme.ParameterCodec, "", - func() *v1.NodeTopology { return &v1.NodeTopology{} }, - func() *v1.NodeTopologyList { return &v1.NodeTopologyList{} }), + func() *nodetopologyv1.NodeTopology { return &nodetopologyv1.NodeTopology{} }, + func() *nodetopologyv1.NodeTopologyList { return &nodetopologyv1.NodeTopologyList{} }, + ), } } diff --git a/client/nodetopology/clientset/versioned/typed/nodetopology/v1/nodetopology_client.go b/client/nodetopology/clientset/versioned/typed/nodetopology/v1/nodetopology_client.go index 56ffb0a..894be9b 100644 --- a/client/nodetopology/clientset/versioned/typed/nodetopology/v1/nodetopology_client.go +++ b/client/nodetopology/clientset/versioned/typed/nodetopology/v1/nodetopology_client.go @@ -19,10 +19,10 @@ limitations under the License. package v1 import ( - "net/http" + http "net/http" - v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/nodetopology/v1" - "github.com/GoogleCloudPlatform/gke-networking-api/client/nodetopology/clientset/versioned/scheme" + nodetopologyv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/nodetopology/v1" + scheme "github.com/GoogleCloudPlatform/gke-networking-api/client/nodetopology/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) @@ -85,10 +85,10 @@ func New(c rest.Interface) *NetworkingV1Client { } func setConfigDefaults(config *rest.Config) error { - gv := v1.SchemeGroupVersion + gv := nodetopologyv1.SchemeGroupVersion config.GroupVersion = &gv config.APIPath = "/apis" - config.NegotiatedSerializer = scheme.Codecs.WithoutConversion() + config.NegotiatedSerializer = rest.CodecFactoryForGeneratedClient(scheme.Scheme, scheme.Codecs).WithoutConversion() if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() diff --git a/client/nodetopology/informers/externalversions/generic.go b/client/nodetopology/informers/externalversions/generic.go index 6b54cb9..039b22a 100644 --- a/client/nodetopology/informers/externalversions/generic.go +++ b/client/nodetopology/informers/externalversions/generic.go @@ -19,7 +19,7 @@ limitations under the License. package externalversions import ( - "fmt" + fmt "fmt" v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/nodetopology/v1" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/client/nodetopology/informers/externalversions/nodetopology/v1/nodetopology.go b/client/nodetopology/informers/externalversions/nodetopology/v1/nodetopology.go index ca72bb3..04b14bb 100644 --- a/client/nodetopology/informers/externalversions/nodetopology/v1/nodetopology.go +++ b/client/nodetopology/informers/externalversions/nodetopology/v1/nodetopology.go @@ -19,13 +19,13 @@ limitations under the License. package v1 import ( - "context" + context "context" time "time" - nodetopologyv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/nodetopology/v1" + apisnodetopologyv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/nodetopology/v1" versioned "github.com/GoogleCloudPlatform/gke-networking-api/client/nodetopology/clientset/versioned" internalinterfaces "github.com/GoogleCloudPlatform/gke-networking-api/client/nodetopology/informers/externalversions/internalinterfaces" - v1 "github.com/GoogleCloudPlatform/gke-networking-api/client/nodetopology/listers/nodetopology/v1" + nodetopologyv1 "github.com/GoogleCloudPlatform/gke-networking-api/client/nodetopology/listers/nodetopology/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -36,7 +36,7 @@ import ( // NodeTopologies. type NodeTopologyInformer interface { Informer() cache.SharedIndexInformer - Lister() v1.NodeTopologyLister + Lister() nodetopologyv1.NodeTopologyLister } type nodeTopologyInformer struct { @@ -70,7 +70,7 @@ func NewFilteredNodeTopologyInformer(client versioned.Interface, resyncPeriod ti return client.NetworkingV1().NodeTopologies().Watch(context.TODO(), options) }, }, - &nodetopologyv1.NodeTopology{}, + &apisnodetopologyv1.NodeTopology{}, resyncPeriod, indexers, ) @@ -81,9 +81,9 @@ func (f *nodeTopologyInformer) defaultInformer(client versioned.Interface, resyn } func (f *nodeTopologyInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&nodetopologyv1.NodeTopology{}, f.defaultInformer) + return f.factory.InformerFor(&apisnodetopologyv1.NodeTopology{}, f.defaultInformer) } -func (f *nodeTopologyInformer) Lister() v1.NodeTopologyLister { - return v1.NewNodeTopologyLister(f.Informer().GetIndexer()) +func (f *nodeTopologyInformer) Lister() nodetopologyv1.NodeTopologyLister { + return nodetopologyv1.NewNodeTopologyLister(f.Informer().GetIndexer()) } diff --git a/client/nodetopology/listers/nodetopology/v1/nodetopology.go b/client/nodetopology/listers/nodetopology/v1/nodetopology.go index 41109e3..4d87e35 100644 --- a/client/nodetopology/listers/nodetopology/v1/nodetopology.go +++ b/client/nodetopology/listers/nodetopology/v1/nodetopology.go @@ -19,10 +19,10 @@ limitations under the License. package v1 import ( - v1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/nodetopology/v1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" + nodetopologyv1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/nodetopology/v1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" ) // NodeTopologyLister helps list NodeTopologies. @@ -30,19 +30,19 @@ import ( type NodeTopologyLister interface { // List lists all NodeTopologies in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.NodeTopology, err error) + List(selector labels.Selector) (ret []*nodetopologyv1.NodeTopology, err error) // Get retrieves the NodeTopology from the index for a given name. // Objects returned here must be treated as read-only. - Get(name string) (*v1.NodeTopology, error) + Get(name string) (*nodetopologyv1.NodeTopology, error) NodeTopologyListerExpansion } // nodeTopologyLister implements the NodeTopologyLister interface. type nodeTopologyLister struct { - listers.ResourceIndexer[*v1.NodeTopology] + listers.ResourceIndexer[*nodetopologyv1.NodeTopology] } // NewNodeTopologyLister returns a new NodeTopologyLister. func NewNodeTopologyLister(indexer cache.Indexer) NodeTopologyLister { - return &nodeTopologyLister{listers.New[*v1.NodeTopology](indexer, v1.Resource("nodetopology"))} + return &nodeTopologyLister{listers.New[*nodetopologyv1.NodeTopology](indexer, nodetopologyv1.Resource("nodetopology"))} } diff --git a/hack/go.mod b/hack/go.mod index 636b995..2b4e3f1 100644 --- a/hack/go.mod +++ b/hack/go.mod @@ -1,10 +1,12 @@ module github.com/GoogleCloudPlatform/gke-networking-api/hack -go 1.22.0 +go 1.23.0 + +toolchain go1.23.5 require ( - k8s.io/code-generator v0.31.2 - sigs.k8s.io/controller-tools v0.16.5 + k8s.io/code-generator v0.32.1 + sigs.k8s.io/controller-tools v0.17.1 ) require ( @@ -23,22 +25,22 @@ require ( github.com/spf13/cobra v1.8.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/x448/float16 v0.8.4 // indirect - golang.org/x/mod v0.21.0 // indirect - golang.org/x/net v0.30.0 // indirect - golang.org/x/sync v0.8.0 // indirect - golang.org/x/sys v0.26.0 // indirect - golang.org/x/text v0.19.0 // indirect - golang.org/x/tools v0.26.0 // indirect + golang.org/x/mod v0.22.0 // indirect + golang.org/x/net v0.34.0 // indirect + golang.org/x/sync v0.10.0 // indirect + golang.org/x/sys v0.29.0 // indirect + golang.org/x/text v0.21.0 // indirect + golang.org/x/tools v0.29.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.31.2 // indirect - k8s.io/apiextensions-apiserver v0.31.2 // indirect - k8s.io/apimachinery v0.31.2 // indirect - k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect + k8s.io/api v0.32.0 // indirect + k8s.io/apiextensions-apiserver v0.32.0 // indirect + k8s.io/apimachinery v0.32.1 // indirect + k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect k8s.io/klog/v2 v2.130.1 // indirect - k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect - sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect + k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect + sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/hack/go.sum b/hack/go.sum index a8416ac..b685c3d 100644 --- a/hack/go.sum +++ b/hack/go.sum @@ -11,12 +11,12 @@ github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= -github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= -github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= -github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= -github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= +github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= github.com/gobuffalo/flect v1.0.3 h1:xeWBM2nui+qnVvNM4S3foBhCAL2XgPU+a7FdpelbTq4= github.com/gobuffalo/flect v1.0.3/go.mod h1:A5msMlrHtLqh9umBSnvabjsMrCcCpAyzglnDvkbYKHs= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= @@ -59,8 +59,8 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8= -github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc= +github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8= +github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -89,42 +89,42 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= -golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= +golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= +golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= -golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= +golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= +golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= -golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= -golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= -golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= +golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE= +golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= @@ -132,33 +132,32 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0= -k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk= -k8s.io/apiextensions-apiserver v0.31.2 h1:W8EwUb8+WXBLu56ser5IudT2cOho0gAKeTOnywBLxd0= -k8s.io/apiextensions-apiserver v0.31.2/go.mod h1:i+Geh+nGCJEGiCGR3MlBDkS7koHIIKWVfWeRFiOsUcM= -k8s.io/apimachinery v0.31.2 h1:i4vUt2hPK56W6mlT7Ry+AO8eEsyxMD1U44NR22CLTYw= -k8s.io/apimachinery v0.31.2/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= -k8s.io/code-generator v0.31.2 h1:xLWxG0HEpMSHfcM//3u3Ro2Hmc6AyyLINQS//Z2GEOI= -k8s.io/code-generator v0.31.2/go.mod h1:eEQHXgBU/m7LDaToDoiz3t97dUUVyOblQdwOr8rivqc= -k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo= -k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8= +k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE= +k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0= +k8s.io/apiextensions-apiserver v0.32.0 h1:S0Xlqt51qzzqjKPxfgX1xh4HBZE+p8KKBq+k2SWNOE0= +k8s.io/apiextensions-apiserver v0.32.0/go.mod h1:86hblMvN5yxMvZrZFX2OhIHAuFIMJIZ19bTvzkP+Fmw= +k8s.io/apimachinery v0.32.1 h1:683ENpaCBjma4CYqsmZyhEzrGz6cjn1MY/X2jB2hkZs= +k8s.io/apimachinery v0.32.1/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= +k8s.io/code-generator v0.32.1 h1:4lw1kFNDuFYXquTkB7Sl5EwPMUP2yyW9hh6BnFfRZFY= +k8s.io/code-generator v0.32.1/go.mod h1:zaILfm00CVyP/6/pJMJ3zxRepXkxyDfUV5SNG4CjZI4= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 h1:si3PfKm8dDYxgfbeA6orqrtLkvvIeH8UqffFJDl0bz4= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= -k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/controller-tools v0.16.5 h1:5k9FNRqziBPwqr17AMEPPV/En39ZBplLAdOwwQHruP4= -sigs.k8s.io/controller-tools v0.16.5/go.mod h1:8vztuRVzs8IuuJqKqbXCSlXcw+lkAv/M2sTpg55qjMY= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y= +k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4= +k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro= +k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +sigs.k8s.io/controller-tools v0.17.1 h1:bQ+dKCS7jY9AgpefenBDtm6geJZCHVKbegpLynxgyus= +sigs.k8s.io/controller-tools v0.17.1/go.mod h1:3QXAdrmdxYuQ4MifvbCAFD9wLXn7jylnfBPYS4yVDdc= +sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8= +sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo= +sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA= +sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=