diff --git a/apis/fqdnnetworkpolicy/v1alpha1/zz_generated.register.go b/apis/fqdnnetworkpolicy/v1alpha1/zz_generated.register.go index 3eb08b5..b0546f7 100644 --- a/apis/fqdnnetworkpolicy/v1alpha1/zz_generated.register.go +++ b/apis/fqdnnetworkpolicy/v1alpha1/zz_generated.register.go @@ -23,8 +23,8 @@ package v1alpha1 import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" + runtime "k8s.io/apimachinery/pkg/runtime" + schema "k8s.io/apimachinery/pkg/runtime/schema" ) // GroupName specifies the group name used to register the objects. diff --git a/apis/gcpfirewall/v1/zz_generated.register.go b/apis/gcpfirewall/v1/zz_generated.register.go index aa594fc..219b943 100644 --- a/apis/gcpfirewall/v1/zz_generated.register.go +++ b/apis/gcpfirewall/v1/zz_generated.register.go @@ -22,16 +22,16 @@ 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" + runtime "k8s.io/apimachinery/pkg/runtime" + schema "k8s.io/apimachinery/pkg/runtime/schema" ) // 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 +65,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..e60c616 100644 --- a/apis/network/v1/zz_generated.register.go +++ b/apis/network/v1/zz_generated.register.go @@ -22,16 +22,16 @@ 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" + runtime "k8s.io/apimachinery/pkg/runtime" + schema "k8s.io/apimachinery/pkg/runtime/schema" ) // 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 +71,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..f14464d 100644 --- a/apis/nodetopology/v1/zz_generated.register.go +++ b/apis/nodetopology/v1/zz_generated.register.go @@ -22,16 +22,16 @@ 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" + runtime "k8s.io/apimachinery/pkg/runtime" + schema "k8s.io/apimachinery/pkg/runtime/schema" ) // 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 +65,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/fqdnnetworkpolicy/clientset/versioned/clientset.go b/client/fqdnnetworkpolicy/clientset/versioned/clientset.go index a13ed9f..6f20eaf 100644 --- a/client/fqdnnetworkpolicy/clientset/versioned/clientset.go +++ b/client/fqdnnetworkpolicy/clientset/versioned/clientset.go @@ -19,8 +19,8 @@ limitations under the License. package versioned import ( - "fmt" - "net/http" + fmt "fmt" + http "net/http" networkingv1alpha1 "github.com/GoogleCloudPlatform/gke-networking-api/client/fqdnnetworkpolicy/clientset/versioned/typed/fqdnnetworkpolicy/v1alpha1" discovery "k8s.io/client-go/discovery" diff --git a/client/fqdnnetworkpolicy/clientset/versioned/fake/clientset_generated.go b/client/fqdnnetworkpolicy/clientset/versioned/fake/clientset_generated.go index 8b779e9..410cf8e 100644 --- a/client/fqdnnetworkpolicy/clientset/versioned/fake/clientset_generated.go +++ b/client/fqdnnetworkpolicy/clientset/versioned/fake/clientset_generated.go @@ -22,6 +22,7 @@ import ( clientset "github.com/GoogleCloudPlatform/gke-networking-api/client/fqdnnetworkpolicy/clientset/versioned" networkingv1alpha1 "github.com/GoogleCloudPlatform/gke-networking-api/client/fqdnnetworkpolicy/clientset/versioned/typed/fqdnnetworkpolicy/v1alpha1" fakenetworkingv1alpha1 "github.com/GoogleCloudPlatform/gke-networking-api/client/fqdnnetworkpolicy/clientset/versioned/typed/fqdnnetworkpolicy/v1alpha1/fake" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" @@ -49,9 +50,13 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset { cs.discovery = &fakediscovery.FakeDiscovery{Fake: &cs.Fake} cs.AddReactor("*", "*", testing.ObjectReaction(o)) cs.AddWatchReactor("*", func(action testing.Action) (handled bool, ret watch.Interface, err error) { + var opts metav1.ListOptions + if watchActcion, ok := action.(testing.WatchActionImpl); ok { + opts = watchActcion.ListOptions + } gvr := action.GetResource() ns := action.GetNamespace() - watch, err := o.Watch(gvr, ns) + watch, err := o.Watch(gvr, ns, opts) if err != nil { return false, nil, err } diff --git a/client/fqdnnetworkpolicy/clientset/versioned/typed/fqdnnetworkpolicy/v1alpha1/fake/fake_fqdnnetworkpolicy.go b/client/fqdnnetworkpolicy/clientset/versioned/typed/fqdnnetworkpolicy/v1alpha1/fake/fake_fqdnnetworkpolicy.go index cb77587..2238852 100644 --- a/client/fqdnnetworkpolicy/clientset/versioned/typed/fqdnnetworkpolicy/v1alpha1/fake/fake_fqdnnetworkpolicy.go +++ b/client/fqdnnetworkpolicy/clientset/versioned/typed/fqdnnetworkpolicy/v1alpha1/fake/fake_fqdnnetworkpolicy.go @@ -19,116 +19,34 @@ limitations under the License. package fake import ( - "context" - v1alpha1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/fqdnnetworkpolicy/v1alpha1" - v1 "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" + fqdnnetworkpolicyv1alpha1 "github.com/GoogleCloudPlatform/gke-networking-api/client/fqdnnetworkpolicy/clientset/versioned/typed/fqdnnetworkpolicy/v1alpha1" + gentype "k8s.io/client-go/gentype" ) -// FakeFQDNNetworkPolicies implements FQDNNetworkPolicyInterface -type FakeFQDNNetworkPolicies struct { +// fakeFQDNNetworkPolicies implements FQDNNetworkPolicyInterface +type fakeFQDNNetworkPolicies struct { + *gentype.FakeClientWithList[*v1alpha1.FQDNNetworkPolicy, *v1alpha1.FQDNNetworkPolicyList] Fake *FakeNetworkingV1alpha1 - ns string -} - -var fqdnnetworkpoliciesResource = v1alpha1.SchemeGroupVersion.WithResource("fqdnnetworkpolicies") - -var fqdnnetworkpoliciesKind = v1alpha1.SchemeGroupVersion.WithKind("FQDNNetworkPolicy") - -// Get takes name of the fQDNNetworkPolicy, and returns the corresponding fQDNNetworkPolicy object, and an error if there is any. -func (c *FakeFQDNNetworkPolicies) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.FQDNNetworkPolicy, err error) { - emptyResult := &v1alpha1.FQDNNetworkPolicy{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(fqdnnetworkpoliciesResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.FQDNNetworkPolicy), err -} - -// List takes label and field selectors, and returns the list of FQDNNetworkPolicies that match those selectors. -func (c *FakeFQDNNetworkPolicies) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.FQDNNetworkPolicyList, err error) { - emptyResult := &v1alpha1.FQDNNetworkPolicyList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(fqdnnetworkpoliciesResource, fqdnnetworkpoliciesKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.FQDNNetworkPolicyList{ListMeta: obj.(*v1alpha1.FQDNNetworkPolicyList).ListMeta} - for _, item := range obj.(*v1alpha1.FQDNNetworkPolicyList).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 fQDNNetworkPolicies. -func (c *FakeFQDNNetworkPolicies) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(fqdnnetworkpoliciesResource, c.ns, opts)) - -} - -// Create takes the representation of a fQDNNetworkPolicy and creates it. Returns the server's representation of the fQDNNetworkPolicy, and an error, if there is any. -func (c *FakeFQDNNetworkPolicies) Create(ctx context.Context, fQDNNetworkPolicy *v1alpha1.FQDNNetworkPolicy, opts v1.CreateOptions) (result *v1alpha1.FQDNNetworkPolicy, err error) { - emptyResult := &v1alpha1.FQDNNetworkPolicy{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(fqdnnetworkpoliciesResource, c.ns, fQDNNetworkPolicy, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.FQDNNetworkPolicy), err -} - -// Update takes the representation of a fQDNNetworkPolicy and updates it. Returns the server's representation of the fQDNNetworkPolicy, and an error, if there is any. -func (c *FakeFQDNNetworkPolicies) Update(ctx context.Context, fQDNNetworkPolicy *v1alpha1.FQDNNetworkPolicy, opts v1.UpdateOptions) (result *v1alpha1.FQDNNetworkPolicy, err error) { - emptyResult := &v1alpha1.FQDNNetworkPolicy{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(fqdnnetworkpoliciesResource, c.ns, fQDNNetworkPolicy, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.FQDNNetworkPolicy), err -} - -// Delete takes name of the fQDNNetworkPolicy and deletes it. Returns an error if one occurs. -func (c *FakeFQDNNetworkPolicies) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(fqdnnetworkpoliciesResource, c.ns, name, opts), &v1alpha1.FQDNNetworkPolicy{}) - - return err } -// DeleteCollection deletes a collection of objects. -func (c *FakeFQDNNetworkPolicies) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(fqdnnetworkpoliciesResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha1.FQDNNetworkPolicyList{}) - return err -} - -// Patch applies the patch and returns the patched fQDNNetworkPolicy. -func (c *FakeFQDNNetworkPolicies) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.FQDNNetworkPolicy, err error) { - emptyResult := &v1alpha1.FQDNNetworkPolicy{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(fqdnnetworkpoliciesResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeFQDNNetworkPolicies(fake *FakeNetworkingV1alpha1, namespace string) fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicyInterface { + return &fakeFQDNNetworkPolicies{ + gentype.NewFakeClientWithList[*v1alpha1.FQDNNetworkPolicy, *v1alpha1.FQDNNetworkPolicyList]( + fake.Fake, + namespace, + v1alpha1.SchemeGroupVersion.WithResource("fqdnnetworkpolicies"), + v1alpha1.SchemeGroupVersion.WithKind("FQDNNetworkPolicy"), + func() *v1alpha1.FQDNNetworkPolicy { return &v1alpha1.FQDNNetworkPolicy{} }, + func() *v1alpha1.FQDNNetworkPolicyList { return &v1alpha1.FQDNNetworkPolicyList{} }, + func(dst, src *v1alpha1.FQDNNetworkPolicyList) { dst.ListMeta = src.ListMeta }, + func(list *v1alpha1.FQDNNetworkPolicyList) []*v1alpha1.FQDNNetworkPolicy { + return gentype.ToPointerSlice(list.Items) + }, + func(list *v1alpha1.FQDNNetworkPolicyList, items []*v1alpha1.FQDNNetworkPolicy) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1alpha1.FQDNNetworkPolicy), err } diff --git a/client/fqdnnetworkpolicy/clientset/versioned/typed/fqdnnetworkpolicy/v1alpha1/fake/fake_fqdnnetworkpolicy_client.go b/client/fqdnnetworkpolicy/clientset/versioned/typed/fqdnnetworkpolicy/v1alpha1/fake/fake_fqdnnetworkpolicy_client.go index 00884dc..d545a38 100644 --- a/client/fqdnnetworkpolicy/clientset/versioned/typed/fqdnnetworkpolicy/v1alpha1/fake/fake_fqdnnetworkpolicy_client.go +++ b/client/fqdnnetworkpolicy/clientset/versioned/typed/fqdnnetworkpolicy/v1alpha1/fake/fake_fqdnnetworkpolicy_client.go @@ -29,7 +29,7 @@ type FakeNetworkingV1alpha1 struct { } func (c *FakeNetworkingV1alpha1) FQDNNetworkPolicies(namespace string) v1alpha1.FQDNNetworkPolicyInterface { - return &FakeFQDNNetworkPolicies{c, namespace} + return newFakeFQDNNetworkPolicies(c, namespace) } // RESTClient returns a RESTClient that is used to communicate diff --git a/client/fqdnnetworkpolicy/clientset/versioned/typed/fqdnnetworkpolicy/v1alpha1/fqdnnetworkpolicy.go b/client/fqdnnetworkpolicy/clientset/versioned/typed/fqdnnetworkpolicy/v1alpha1/fqdnnetworkpolicy.go index 32e03cc..de48106 100644 --- a/client/fqdnnetworkpolicy/clientset/versioned/typed/fqdnnetworkpolicy/v1alpha1/fqdnnetworkpolicy.go +++ b/client/fqdnnetworkpolicy/clientset/versioned/typed/fqdnnetworkpolicy/v1alpha1/fqdnnetworkpolicy.go @@ -19,9 +19,9 @@ limitations under the License. package v1alpha1 import ( - "context" + context "context" - v1alpha1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/fqdnnetworkpolicy/v1alpha1" + fqdnnetworkpolicyv1alpha1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/fqdnnetworkpolicy/v1alpha1" scheme "github.com/GoogleCloudPlatform/gke-networking-api/client/fqdnnetworkpolicy/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -37,31 +37,36 @@ type FQDNNetworkPoliciesGetter interface { // FQDNNetworkPolicyInterface has methods to work with FQDNNetworkPolicy resources. type FQDNNetworkPolicyInterface interface { - Create(ctx context.Context, fQDNNetworkPolicy *v1alpha1.FQDNNetworkPolicy, opts v1.CreateOptions) (*v1alpha1.FQDNNetworkPolicy, error) - Update(ctx context.Context, fQDNNetworkPolicy *v1alpha1.FQDNNetworkPolicy, opts v1.UpdateOptions) (*v1alpha1.FQDNNetworkPolicy, error) + Create(ctx context.Context, fQDNNetworkPolicy *fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicy, opts v1.CreateOptions) (*fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicy, error) + Update(ctx context.Context, fQDNNetworkPolicy *fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicy, opts v1.UpdateOptions) (*fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicy, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.FQDNNetworkPolicy, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.FQDNNetworkPolicyList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicy, error) + List(ctx context.Context, opts v1.ListOptions) (*fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicyList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.FQDNNetworkPolicy, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicy, err error) FQDNNetworkPolicyExpansion } // fQDNNetworkPolicies implements FQDNNetworkPolicyInterface type fQDNNetworkPolicies struct { - *gentype.ClientWithList[*v1alpha1.FQDNNetworkPolicy, *v1alpha1.FQDNNetworkPolicyList] + *gentype.ClientWithList[*fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicy, *fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicyList] } // newFQDNNetworkPolicies returns a FQDNNetworkPolicies func newFQDNNetworkPolicies(c *NetworkingV1alpha1Client, namespace string) *fQDNNetworkPolicies { return &fQDNNetworkPolicies{ - gentype.NewClientWithList[*v1alpha1.FQDNNetworkPolicy, *v1alpha1.FQDNNetworkPolicyList]( + gentype.NewClientWithList[*fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicy, *fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicyList]( "fqdnnetworkpolicies", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1alpha1.FQDNNetworkPolicy { return &v1alpha1.FQDNNetworkPolicy{} }, - func() *v1alpha1.FQDNNetworkPolicyList { return &v1alpha1.FQDNNetworkPolicyList{} }), + func() *fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicy { + return &fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicy{} + }, + func() *fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicyList { + return &fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicyList{} + }, + ), } } diff --git a/client/fqdnnetworkpolicy/clientset/versioned/typed/fqdnnetworkpolicy/v1alpha1/fqdnnetworkpolicy_client.go b/client/fqdnnetworkpolicy/clientset/versioned/typed/fqdnnetworkpolicy/v1alpha1/fqdnnetworkpolicy_client.go index aed8862..fa5c8bc 100644 --- a/client/fqdnnetworkpolicy/clientset/versioned/typed/fqdnnetworkpolicy/v1alpha1/fqdnnetworkpolicy_client.go +++ b/client/fqdnnetworkpolicy/clientset/versioned/typed/fqdnnetworkpolicy/v1alpha1/fqdnnetworkpolicy_client.go @@ -19,10 +19,10 @@ limitations under the License. package v1alpha1 import ( - "net/http" + http "net/http" - v1alpha1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/fqdnnetworkpolicy/v1alpha1" - "github.com/GoogleCloudPlatform/gke-networking-api/client/fqdnnetworkpolicy/clientset/versioned/scheme" + fqdnnetworkpolicyv1alpha1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/fqdnnetworkpolicy/v1alpha1" + scheme "github.com/GoogleCloudPlatform/gke-networking-api/client/fqdnnetworkpolicy/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) @@ -45,9 +45,7 @@ func (c *NetworkingV1alpha1Client) FQDNNetworkPolicies(namespace string) FQDNNet // where httpClient was generated with rest.HTTPClientFor(c). func NewForConfig(c *rest.Config) (*NetworkingV1alpha1Client, error) { config := *c - if err := setConfigDefaults(&config); err != nil { - return nil, err - } + setConfigDefaults(&config) httpClient, err := rest.HTTPClientFor(&config) if err != nil { return nil, err @@ -59,9 +57,7 @@ func NewForConfig(c *rest.Config) (*NetworkingV1alpha1Client, error) { // Note the http client provided takes precedence over the configured transport values. func NewForConfigAndClient(c *rest.Config, h *http.Client) (*NetworkingV1alpha1Client, error) { config := *c - if err := setConfigDefaults(&config); err != nil { - return nil, err - } + setConfigDefaults(&config) client, err := rest.RESTClientForConfigAndClient(&config, h) if err != nil { return nil, err @@ -84,17 +80,15 @@ func New(c rest.Interface) *NetworkingV1alpha1Client { return &NetworkingV1alpha1Client{c} } -func setConfigDefaults(config *rest.Config) error { - gv := v1alpha1.SchemeGroupVersion +func setConfigDefaults(config *rest.Config) { + gv := fqdnnetworkpolicyv1alpha1.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() } - - return nil } // RESTClient returns a RESTClient that is used to communicate diff --git a/client/fqdnnetworkpolicy/informers/externalversions/fqdnnetworkpolicy/v1alpha1/fqdnnetworkpolicy.go b/client/fqdnnetworkpolicy/informers/externalversions/fqdnnetworkpolicy/v1alpha1/fqdnnetworkpolicy.go index dc59c02..d76c2aa 100644 --- a/client/fqdnnetworkpolicy/informers/externalversions/fqdnnetworkpolicy/v1alpha1/fqdnnetworkpolicy.go +++ b/client/fqdnnetworkpolicy/informers/externalversions/fqdnnetworkpolicy/v1alpha1/fqdnnetworkpolicy.go @@ -19,13 +19,13 @@ limitations under the License. package v1alpha1 import ( - "context" + context "context" time "time" - fqdnnetworkpolicyv1alpha1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/fqdnnetworkpolicy/v1alpha1" + apisfqdnnetworkpolicyv1alpha1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/fqdnnetworkpolicy/v1alpha1" versioned "github.com/GoogleCloudPlatform/gke-networking-api/client/fqdnnetworkpolicy/clientset/versioned" internalinterfaces "github.com/GoogleCloudPlatform/gke-networking-api/client/fqdnnetworkpolicy/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/GoogleCloudPlatform/gke-networking-api/client/fqdnnetworkpolicy/listers/fqdnnetworkpolicy/v1alpha1" + fqdnnetworkpolicyv1alpha1 "github.com/GoogleCloudPlatform/gke-networking-api/client/fqdnnetworkpolicy/listers/fqdnnetworkpolicy/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -36,7 +36,7 @@ import ( // FQDNNetworkPolicies. type FQDNNetworkPolicyInformer interface { Informer() cache.SharedIndexInformer - Lister() v1alpha1.FQDNNetworkPolicyLister + Lister() fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicyLister } type fQDNNetworkPolicyInformer struct { @@ -62,16 +62,28 @@ func NewFilteredFQDNNetworkPolicyInformer(client versioned.Interface, namespace if tweakListOptions != nil { tweakListOptions(&options) } - return client.NetworkingV1alpha1().FQDNNetworkPolicies(namespace).List(context.TODO(), options) + return client.NetworkingV1alpha1().FQDNNetworkPolicies(namespace).List(context.Background(), options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } - return client.NetworkingV1alpha1().FQDNNetworkPolicies(namespace).Watch(context.TODO(), options) + return client.NetworkingV1alpha1().FQDNNetworkPolicies(namespace).Watch(context.Background(), options) + }, + ListWithContextFunc: func(ctx context.Context, options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.NetworkingV1alpha1().FQDNNetworkPolicies(namespace).List(ctx, options) + }, + WatchFuncWithContext: func(ctx context.Context, options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.NetworkingV1alpha1().FQDNNetworkPolicies(namespace).Watch(ctx, options) }, }, - &fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicy{}, + &apisfqdnnetworkpolicyv1alpha1.FQDNNetworkPolicy{}, resyncPeriod, indexers, ) @@ -82,9 +94,9 @@ func (f *fQDNNetworkPolicyInformer) defaultInformer(client versioned.Interface, } func (f *fQDNNetworkPolicyInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicy{}, f.defaultInformer) + return f.factory.InformerFor(&apisfqdnnetworkpolicyv1alpha1.FQDNNetworkPolicy{}, f.defaultInformer) } -func (f *fQDNNetworkPolicyInformer) Lister() v1alpha1.FQDNNetworkPolicyLister { - return v1alpha1.NewFQDNNetworkPolicyLister(f.Informer().GetIndexer()) +func (f *fQDNNetworkPolicyInformer) Lister() fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicyLister { + return fqdnnetworkpolicyv1alpha1.NewFQDNNetworkPolicyLister(f.Informer().GetIndexer()) } diff --git a/client/fqdnnetworkpolicy/informers/externalversions/generic.go b/client/fqdnnetworkpolicy/informers/externalversions/generic.go index 698bf4c..b505886 100644 --- a/client/fqdnnetworkpolicy/informers/externalversions/generic.go +++ b/client/fqdnnetworkpolicy/informers/externalversions/generic.go @@ -19,7 +19,7 @@ limitations under the License. package externalversions import ( - "fmt" + fmt "fmt" v1alpha1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/fqdnnetworkpolicy/v1alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/client/fqdnnetworkpolicy/listers/fqdnnetworkpolicy/v1alpha1/fqdnnetworkpolicy.go b/client/fqdnnetworkpolicy/listers/fqdnnetworkpolicy/v1alpha1/fqdnnetworkpolicy.go index db8879f..e8d8c4d 100644 --- a/client/fqdnnetworkpolicy/listers/fqdnnetworkpolicy/v1alpha1/fqdnnetworkpolicy.go +++ b/client/fqdnnetworkpolicy/listers/fqdnnetworkpolicy/v1alpha1/fqdnnetworkpolicy.go @@ -19,10 +19,10 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/fqdnnetworkpolicy/v1alpha1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" + fqdnnetworkpolicyv1alpha1 "github.com/GoogleCloudPlatform/gke-networking-api/apis/fqdnnetworkpolicy/v1alpha1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" ) // FQDNNetworkPolicyLister helps list FQDNNetworkPolicies. @@ -30,7 +30,7 @@ import ( type FQDNNetworkPolicyLister interface { // List lists all FQDNNetworkPolicies in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha1.FQDNNetworkPolicy, err error) + List(selector labels.Selector) (ret []*fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicy, err error) // FQDNNetworkPolicies returns an object that can list and get FQDNNetworkPolicies. FQDNNetworkPolicies(namespace string) FQDNNetworkPolicyNamespaceLister FQDNNetworkPolicyListerExpansion @@ -38,17 +38,17 @@ type FQDNNetworkPolicyLister interface { // fQDNNetworkPolicyLister implements the FQDNNetworkPolicyLister interface. type fQDNNetworkPolicyLister struct { - listers.ResourceIndexer[*v1alpha1.FQDNNetworkPolicy] + listers.ResourceIndexer[*fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicy] } // NewFQDNNetworkPolicyLister returns a new FQDNNetworkPolicyLister. func NewFQDNNetworkPolicyLister(indexer cache.Indexer) FQDNNetworkPolicyLister { - return &fQDNNetworkPolicyLister{listers.New[*v1alpha1.FQDNNetworkPolicy](indexer, v1alpha1.Resource("fqdnnetworkpolicy"))} + return &fQDNNetworkPolicyLister{listers.New[*fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicy](indexer, fqdnnetworkpolicyv1alpha1.Resource("fqdnnetworkpolicy"))} } // FQDNNetworkPolicies returns an object that can list and get FQDNNetworkPolicies. func (s *fQDNNetworkPolicyLister) FQDNNetworkPolicies(namespace string) FQDNNetworkPolicyNamespaceLister { - return fQDNNetworkPolicyNamespaceLister{listers.NewNamespaced[*v1alpha1.FQDNNetworkPolicy](s.ResourceIndexer, namespace)} + return fQDNNetworkPolicyNamespaceLister{listers.NewNamespaced[*fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicy](s.ResourceIndexer, namespace)} } // FQDNNetworkPolicyNamespaceLister helps list and get FQDNNetworkPolicies. @@ -56,15 +56,15 @@ func (s *fQDNNetworkPolicyLister) FQDNNetworkPolicies(namespace string) FQDNNetw type FQDNNetworkPolicyNamespaceLister interface { // List lists all FQDNNetworkPolicies in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha1.FQDNNetworkPolicy, err error) + List(selector labels.Selector) (ret []*fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicy, err error) // Get retrieves the FQDNNetworkPolicy from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1alpha1.FQDNNetworkPolicy, error) + Get(name string) (*fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicy, error) FQDNNetworkPolicyNamespaceListerExpansion } // fQDNNetworkPolicyNamespaceLister implements the FQDNNetworkPolicyNamespaceLister // interface. type fQDNNetworkPolicyNamespaceLister struct { - listers.ResourceIndexer[*v1alpha1.FQDNNetworkPolicy] + listers.ResourceIndexer[*fqdnnetworkpolicyv1alpha1.FQDNNetworkPolicy] } 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/fake/clientset_generated.go b/client/gcpfirewall/clientset/versioned/fake/clientset_generated.go index cb28f17..5c6f595 100644 --- a/client/gcpfirewall/clientset/versioned/fake/clientset_generated.go +++ b/client/gcpfirewall/clientset/versioned/fake/clientset_generated.go @@ -22,6 +22,7 @@ import ( clientset "github.com/GoogleCloudPlatform/gke-networking-api/client/gcpfirewall/clientset/versioned" networkingv1 "github.com/GoogleCloudPlatform/gke-networking-api/client/gcpfirewall/clientset/versioned/typed/gcpfirewall/v1" fakenetworkingv1 "github.com/GoogleCloudPlatform/gke-networking-api/client/gcpfirewall/clientset/versioned/typed/gcpfirewall/v1/fake" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" @@ -49,9 +50,13 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset { cs.discovery = &fakediscovery.FakeDiscovery{Fake: &cs.Fake} cs.AddReactor("*", "*", testing.ObjectReaction(o)) cs.AddWatchReactor("*", func(action testing.Action) (handled bool, ret watch.Interface, err error) { + var opts metav1.ListOptions + if watchActcion, ok := action.(testing.WatchActionImpl); ok { + opts = watchActcion.ListOptions + } gvr := action.GetResource() ns := action.GetNamespace() - watch, err := o.Watch(gvr, ns) + watch, err := o.Watch(gvr, ns, opts) if err != nil { return false, nil, err } 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..d8fe86f 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" ) @@ -45,9 +45,7 @@ func (c *NetworkingV1Client) GCPFirewalls() GCPFirewallInterface { // where httpClient was generated with rest.HTTPClientFor(c). func NewForConfig(c *rest.Config) (*NetworkingV1Client, error) { config := *c - if err := setConfigDefaults(&config); err != nil { - return nil, err - } + setConfigDefaults(&config) httpClient, err := rest.HTTPClientFor(&config) if err != nil { return nil, err @@ -59,9 +57,7 @@ func NewForConfig(c *rest.Config) (*NetworkingV1Client, error) { // Note the http client provided takes precedence over the configured transport values. func NewForConfigAndClient(c *rest.Config, h *http.Client) (*NetworkingV1Client, error) { config := *c - if err := setConfigDefaults(&config); err != nil { - return nil, err - } + setConfigDefaults(&config) client, err := rest.RESTClientForConfigAndClient(&config, h) if err != nil { return nil, err @@ -84,17 +80,15 @@ func New(c rest.Interface) *NetworkingV1Client { return &NetworkingV1Client{c} } -func setConfigDefaults(config *rest.Config) error { - gv := v1.SchemeGroupVersion +func setConfigDefaults(config *rest.Config) { + 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() } - - return nil } // RESTClient returns a RESTClient that is used to communicate diff --git a/client/gcpfirewall/informers/externalversions/gcpfirewall/v1/gcpfirewall.go b/client/gcpfirewall/informers/externalversions/gcpfirewall/v1/gcpfirewall.go index 907f90b..d48467e 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 { @@ -61,16 +61,28 @@ func NewFilteredGCPFirewallInformer(client versioned.Interface, resyncPeriod tim if tweakListOptions != nil { tweakListOptions(&options) } - return client.NetworkingV1().GCPFirewalls().List(context.TODO(), options) + return client.NetworkingV1().GCPFirewalls().List(context.Background(), options) }, WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } - return client.NetworkingV1().GCPFirewalls().Watch(context.TODO(), options) + return client.NetworkingV1().GCPFirewalls().Watch(context.Background(), options) + }, + ListWithContextFunc: func(ctx context.Context, options metav1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.NetworkingV1().GCPFirewalls().List(ctx, options) + }, + WatchFuncWithContext: func(ctx context.Context, options metav1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.NetworkingV1().GCPFirewalls().Watch(ctx, options) }, }, - &gcpfirewallv1.GCPFirewall{}, + &apisgcpfirewallv1.GCPFirewall{}, resyncPeriod, indexers, ) @@ -81,9 +93,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/fake/clientset_generated.go b/client/network/clientset/versioned/fake/clientset_generated.go index 7bc9d35..e5b5bf7 100644 --- a/client/network/clientset/versioned/fake/clientset_generated.go +++ b/client/network/clientset/versioned/fake/clientset_generated.go @@ -22,6 +22,7 @@ import ( clientset "github.com/GoogleCloudPlatform/gke-networking-api/client/network/clientset/versioned" networkingv1 "github.com/GoogleCloudPlatform/gke-networking-api/client/network/clientset/versioned/typed/network/v1" fakenetworkingv1 "github.com/GoogleCloudPlatform/gke-networking-api/client/network/clientset/versioned/typed/network/v1/fake" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" @@ -49,9 +50,13 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset { cs.discovery = &fakediscovery.FakeDiscovery{Fake: &cs.Fake} cs.AddReactor("*", "*", testing.ObjectReaction(o)) cs.AddWatchReactor("*", func(action testing.Action) (handled bool, ret watch.Interface, err error) { + var opts metav1.ListOptions + if watchActcion, ok := action.(testing.WatchActionImpl); ok { + opts = watchActcion.ListOptions + } gvr := action.GetResource() ns := action.GetNamespace() - watch, err := o.Watch(gvr, ns) + watch, err := o.Watch(gvr, ns, opts) if err != nil { return false, nil, err } 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..15116d4 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" ) @@ -60,9 +60,7 @@ func (c *NetworkingV1Client) Subnetworks() SubnetworkInterface { // where httpClient was generated with rest.HTTPClientFor(c). func NewForConfig(c *rest.Config) (*NetworkingV1Client, error) { config := *c - if err := setConfigDefaults(&config); err != nil { - return nil, err - } + setConfigDefaults(&config) httpClient, err := rest.HTTPClientFor(&config) if err != nil { return nil, err @@ -74,9 +72,7 @@ func NewForConfig(c *rest.Config) (*NetworkingV1Client, error) { // Note the http client provided takes precedence over the configured transport values. func NewForConfigAndClient(c *rest.Config, h *http.Client) (*NetworkingV1Client, error) { config := *c - if err := setConfigDefaults(&config); err != nil { - return nil, err - } + setConfigDefaults(&config) client, err := rest.RESTClientForConfigAndClient(&config, h) if err != nil { return nil, err @@ -99,17 +95,15 @@ func New(c rest.Interface) *NetworkingV1Client { return &NetworkingV1Client{c} } -func setConfigDefaults(config *rest.Config) error { - gv := v1.SchemeGroupVersion +func setConfigDefaults(config *rest.Config) { + 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() } - - return nil } // RESTClient returns a RESTClient that is used to communicate 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..1a13984 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 { @@ -61,16 +61,28 @@ func NewFilteredGKENetworkParamSetInformer(client versioned.Interface, resyncPer if tweakListOptions != nil { tweakListOptions(&options) } - return client.NetworkingV1().GKENetworkParamSets().List(context.TODO(), options) + return client.NetworkingV1().GKENetworkParamSets().List(context.Background(), options) }, WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } - return client.NetworkingV1().GKENetworkParamSets().Watch(context.TODO(), options) + return client.NetworkingV1().GKENetworkParamSets().Watch(context.Background(), options) + }, + ListWithContextFunc: func(ctx context.Context, options metav1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.NetworkingV1().GKENetworkParamSets().List(ctx, options) + }, + WatchFuncWithContext: func(ctx context.Context, options metav1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.NetworkingV1().GKENetworkParamSets().Watch(ctx, options) }, }, - &networkv1.GKENetworkParamSet{}, + &apisnetworkv1.GKENetworkParamSet{}, resyncPeriod, indexers, ) @@ -81,9 +93,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..d79c63c 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 { @@ -61,16 +61,28 @@ func NewFilteredNetworkInformer(client versioned.Interface, resyncPeriod time.Du if tweakListOptions != nil { tweakListOptions(&options) } - return client.NetworkingV1().Networks().List(context.TODO(), options) + return client.NetworkingV1().Networks().List(context.Background(), options) }, WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } - return client.NetworkingV1().Networks().Watch(context.TODO(), options) + return client.NetworkingV1().Networks().Watch(context.Background(), options) + }, + ListWithContextFunc: func(ctx context.Context, options metav1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.NetworkingV1().Networks().List(ctx, options) + }, + WatchFuncWithContext: func(ctx context.Context, options metav1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.NetworkingV1().Networks().Watch(ctx, options) }, }, - &networkv1.Network{}, + &apisnetworkv1.Network{}, resyncPeriod, indexers, ) @@ -81,9 +93,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..8ed216f 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 { @@ -62,16 +62,28 @@ func NewFilteredNetworkInterfaceInformer(client versioned.Interface, namespace s if tweakListOptions != nil { tweakListOptions(&options) } - return client.NetworkingV1().NetworkInterfaces(namespace).List(context.TODO(), options) + return client.NetworkingV1().NetworkInterfaces(namespace).List(context.Background(), options) }, WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } - return client.NetworkingV1().NetworkInterfaces(namespace).Watch(context.TODO(), options) + return client.NetworkingV1().NetworkInterfaces(namespace).Watch(context.Background(), options) + }, + ListWithContextFunc: func(ctx context.Context, options metav1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.NetworkingV1().NetworkInterfaces(namespace).List(ctx, options) + }, + WatchFuncWithContext: func(ctx context.Context, options metav1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.NetworkingV1().NetworkInterfaces(namespace).Watch(ctx, options) }, }, - &networkv1.NetworkInterface{}, + &apisnetworkv1.NetworkInterface{}, resyncPeriod, indexers, ) @@ -82,9 +94,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..483656f 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 { @@ -61,16 +61,28 @@ func NewFilteredSubnetworkInformer(client versioned.Interface, resyncPeriod time if tweakListOptions != nil { tweakListOptions(&options) } - return client.NetworkingV1().Subnetworks().List(context.TODO(), options) + return client.NetworkingV1().Subnetworks().List(context.Background(), options) }, WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } - return client.NetworkingV1().Subnetworks().Watch(context.TODO(), options) + return client.NetworkingV1().Subnetworks().Watch(context.Background(), options) + }, + ListWithContextFunc: func(ctx context.Context, options metav1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.NetworkingV1().Subnetworks().List(ctx, options) + }, + WatchFuncWithContext: func(ctx context.Context, options metav1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.NetworkingV1().Subnetworks().Watch(ctx, options) }, }, - &networkv1.Subnetwork{}, + &apisnetworkv1.Subnetwork{}, resyncPeriod, indexers, ) @@ -81,9 +93,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/fake/clientset_generated.go b/client/nodetopology/clientset/versioned/fake/clientset_generated.go index 87805aa..95eb1ed 100644 --- a/client/nodetopology/clientset/versioned/fake/clientset_generated.go +++ b/client/nodetopology/clientset/versioned/fake/clientset_generated.go @@ -22,6 +22,7 @@ import ( clientset "github.com/GoogleCloudPlatform/gke-networking-api/client/nodetopology/clientset/versioned" networkingv1 "github.com/GoogleCloudPlatform/gke-networking-api/client/nodetopology/clientset/versioned/typed/nodetopology/v1" fakenetworkingv1 "github.com/GoogleCloudPlatform/gke-networking-api/client/nodetopology/clientset/versioned/typed/nodetopology/v1/fake" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" @@ -49,9 +50,13 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset { cs.discovery = &fakediscovery.FakeDiscovery{Fake: &cs.Fake} cs.AddReactor("*", "*", testing.ObjectReaction(o)) cs.AddWatchReactor("*", func(action testing.Action) (handled bool, ret watch.Interface, err error) { + var opts metav1.ListOptions + if watchActcion, ok := action.(testing.WatchActionImpl); ok { + opts = watchActcion.ListOptions + } gvr := action.GetResource() ns := action.GetNamespace() - watch, err := o.Watch(gvr, ns) + watch, err := o.Watch(gvr, ns, opts) if err != nil { return false, nil, err } 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..9212dee 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" ) @@ -45,9 +45,7 @@ func (c *NetworkingV1Client) NodeTopologies() NodeTopologyInterface { // where httpClient was generated with rest.HTTPClientFor(c). func NewForConfig(c *rest.Config) (*NetworkingV1Client, error) { config := *c - if err := setConfigDefaults(&config); err != nil { - return nil, err - } + setConfigDefaults(&config) httpClient, err := rest.HTTPClientFor(&config) if err != nil { return nil, err @@ -59,9 +57,7 @@ func NewForConfig(c *rest.Config) (*NetworkingV1Client, error) { // Note the http client provided takes precedence over the configured transport values. func NewForConfigAndClient(c *rest.Config, h *http.Client) (*NetworkingV1Client, error) { config := *c - if err := setConfigDefaults(&config); err != nil { - return nil, err - } + setConfigDefaults(&config) client, err := rest.RESTClientForConfigAndClient(&config, h) if err != nil { return nil, err @@ -84,17 +80,15 @@ func New(c rest.Interface) *NetworkingV1Client { return &NetworkingV1Client{c} } -func setConfigDefaults(config *rest.Config) error { - gv := v1.SchemeGroupVersion +func setConfigDefaults(config *rest.Config) { + 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() } - - return nil } // RESTClient returns a RESTClient that is used to communicate 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..96d98ea 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 { @@ -61,16 +61,28 @@ func NewFilteredNodeTopologyInformer(client versioned.Interface, resyncPeriod ti if tweakListOptions != nil { tweakListOptions(&options) } - return client.NetworkingV1().NodeTopologies().List(context.TODO(), options) + return client.NetworkingV1().NodeTopologies().List(context.Background(), options) }, WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } - return client.NetworkingV1().NodeTopologies().Watch(context.TODO(), options) + return client.NetworkingV1().NodeTopologies().Watch(context.Background(), options) + }, + ListWithContextFunc: func(ctx context.Context, options metav1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.NetworkingV1().NodeTopologies().List(ctx, options) + }, + WatchFuncWithContext: func(ctx context.Context, options metav1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.NetworkingV1().NodeTopologies().Watch(ctx, options) }, }, - &nodetopologyv1.NodeTopology{}, + &apisnodetopologyv1.NodeTopology{}, resyncPeriod, indexers, ) @@ -81,9 +93,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..11da4ef 100644 --- a/hack/go.mod +++ b/hack/go.mod @@ -1,44 +1,54 @@ module github.com/GoogleCloudPlatform/gke-networking-api/hack -go 1.22.0 +go 1.24.0 require ( - k8s.io/code-generator v0.31.2 - sigs.k8s.io/controller-tools v0.16.5 + k8s.io/code-generator v0.34.2 + sigs.k8s.io/controller-tools v0.19.0 ) require ( github.com/fatih/color v1.18.0 // indirect - github.com/fxamacker/cbor/v2 v2.7.0 // indirect - github.com/go-logr/logr v1.4.2 // indirect + github.com/fxamacker/cbor/v2 v2.9.0 // indirect + github.com/go-logr/logr v1.4.3 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect + github.com/go-openapi/jsonreference v0.20.2 // indirect + github.com/go-openapi/swag v0.23.0 // indirect github.com/gobuffalo/flect v1.0.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/google/gofuzz v1.2.0 // indirect + github.com/google/gnostic-models v0.7.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect + github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/spf13/cobra v1.8.1 // indirect - github.com/spf13/pflag v1.0.5 // indirect + github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect + github.com/spf13/cobra v1.9.1 // indirect + github.com/spf13/pflag v1.0.7 // 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 + go.yaml.in/yaml/v2 v2.4.2 // indirect + go.yaml.in/yaml/v3 v3.0.4 // indirect + golang.org/x/mod v0.27.0 // indirect + golang.org/x/net v0.43.0 // indirect + golang.org/x/sync v0.16.0 // indirect + golang.org/x/sys v0.35.0 // indirect + golang.org/x/text v0.28.0 // indirect + golang.org/x/tools v0.36.0 // indirect + google.golang.org/protobuf v1.36.7 // 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.34.0 // indirect + k8s.io/apiextensions-apiserver v0.34.0 // indirect + k8s.io/apimachinery v0.34.2 // indirect + k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // 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 - sigs.k8s.io/yaml v1.4.0 // indirect + k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect + k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect + sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect + sigs.k8s.io/randfill v1.0.0 // indirect + sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect + sigs.k8s.io/yaml v1.6.0 // indirect ) diff --git a/hack/go.sum b/hack/go.sum index a8416ac..2aa4fc6 100644 --- a/hack/go.sum +++ b/hack/go.sum @@ -1,36 +1,59 @@ -github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY= +cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw= +github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI= +github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= +github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= +github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= +github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= -github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= -github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= -github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= -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/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= +github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= +github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM= +github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= +github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= +github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= 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.22.3/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/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= 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= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= -github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= -github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/cel-go v0.26.0 h1:DPGjXackMpJWH680oGY4lZhYjIameYmR+/6RBdDGmaI= +github.com/google/cel-go v0.26.0/go.mod h1:A9O8OU9rdvrK5MQyrqfIxo1a0u4g3sF8KB6PUIaryMM= +github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo= +github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= -github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo= +github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= @@ -39,8 +62,11 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= @@ -53,24 +79,39 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFdJifH4BDsTlE89Zl93FEloxaWZfGcifgq8= +github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM= +github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= +github.com/onsi/gomega v1.38.1 h1:FaLA8GlcpXDwsb7m0h2A9ew2aTk3vnZMlzFgg5tz/pk= +github.com/onsi/gomega v1.38.1/go.mod h1:LfcV8wZLvwcYRwPiJysphKAEsmcFnLMK/9c+PjvlX8g= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= 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= -github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= -github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q= +github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= +github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= +github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= -github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo= +github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0= +github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M= +github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs= +github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= @@ -78,53 +119,93 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= +go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 h1:yd02MEjBdJkG3uabWP9apV+OuWRIXGDuJEUJbOHmCFU= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:umTcuxiv1n/s/S6/c2AT/g2CQ7u5C59sHDNmfSwgz7Q= +go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ= +go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 h1:OeNbIYk/2C15ckl7glBlOBp5+WlYsOElzTNmiPW/x60= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0/go.mod h1:7Bept48yIeqxP2OZ9/AqIpYS94h2or0aB4FypJTc8ZM= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 h1:tgJ0uaNS4c98WRNUEx5U3aDlrDOI5Rs+1Vifcw4DJ8U= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0/go.mod h1:U7HYyW0zt/a9x5J1Kjs+r1f/d4ZHnYFclhYY2+YbeoE= +go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M= +go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE= +go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A= +go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU= +go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs= +go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc= +go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4= +go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4= +go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI= +go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU= +go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= +go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= 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.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ= +golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc= 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.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE= +golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg= +golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M= +golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8= 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.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= +golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= 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.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI= +golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4= +golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw= 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.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng= +golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU= +golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY= +golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= 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.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg= +golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s= +golang.org/x/tools/go/expect v0.1.0-deprecated h1:jY2C5HGYR5lqex3gEniOQL0r7Dq5+VGVgY1nudX5lXY= +golang.org/x/tools/go/expect v0.1.0-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY= +golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated h1:1h2MnaIAIXISqTFKdENegdpAgUXz6NrPEsbIeWaBRvM= +golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated/go.mod h1:RVAQXBGNv1ib0J382/DPCRS/BPnsGebyM1Gj5VSDpG8= 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/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb h1:p31xT4yrYrSM/G4Sn2+TNUkVhFCbG9y8itM2S6Th950= +google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:jbe3Bkdp+Dh2IrslsFCklNhweNTBgSYanP1UXhJDhKg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb h1:TLPQVbx1GJ8VKZxz52VAxl1EBgKXXbTiU9Fc5fZeLn4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I= +google.golang.org/grpc v1.72.1 h1:HR03wO6eyZ7lknl75XlxABNVLLFc2PAb6mHlYh756mA= +google.golang.org/grpc v1.72.1/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM= +google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A= +google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= 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 +213,42 @@ 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.34.0 h1:L+JtP2wDbEYPUeNGbeSa/5GwFtIA662EmT2YSLOkAVE= +k8s.io/api v0.34.0/go.mod h1:YzgkIzOOlhl9uwWCZNqpw6RJy9L2FK4dlJeayUoydug= +k8s.io/apiextensions-apiserver v0.34.0 h1:B3hiB32jV7BcyKcMU5fDaDxk882YrJ1KU+ZSkA9Qxoc= +k8s.io/apiextensions-apiserver v0.34.0/go.mod h1:hLI4GxE1BDBy9adJKxUxCEHBGZtGfIg98Q+JmTD7+g0= +k8s.io/apimachinery v0.34.2 h1:zQ12Uk3eMHPxrsbUJgNF8bTauTVR2WgqJsTmwTE/NW4= +k8s.io/apimachinery v0.34.2/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw= +k8s.io/apiserver v0.34.0 h1:Z51fw1iGMqN7uJ1kEaynf2Aec1Y774PqU+FVWCFV3Jg= +k8s.io/apiserver v0.34.0/go.mod h1:52ti5YhxAvewmmpVRqlASvaqxt0gKJxvCeW7ZrwgazQ= +k8s.io/client-go v0.34.0 h1:YoWv5r7bsBfb0Hs2jh8SOvFbKzzxyNo0nSb0zC19KZo= +k8s.io/client-go v0.34.0/go.mod h1:ozgMnEKXkRjeMvBZdV1AijMHLTh3pbACPvK7zFR+QQY= +k8s.io/code-generator v0.34.2 h1:9bG6jTxmsU3HXE5BNYJTC8AZ1D6hVVfkm8yYSkdkGY0= +k8s.io/code-generator v0.34.2/go.mod h1:dnDDEd6S/z4uZ+PG1aE58ySCi/lR4+qT3a4DddE4/2I= +k8s.io/component-base v0.34.0 h1:bS8Ua3zlJzapklsB1dZgjEJuJEeHjj8yTu1gxE2zQX8= +k8s.io/component-base v0.34.0/go.mod h1:RSCqUdvIjjrEm81epPcjQ/DS+49fADvGSCkIP3IC6vg= +k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f h1:SLb+kxmzfA87x4E4brQzB33VBbT2+x7Zq9ROIHmGn9Q= +k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f/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= -sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= -sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= +k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOPolHyvO06MXG5TUIj2mNAA= +k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts= +k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y= +k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= +sigs.k8s.io/controller-tools v0.19.0 h1:OU7jrPPiZusryu6YK0jYSjPqg8Vhf8cAzluP9XGI5uk= +sigs.k8s.io/controller-tools v0.19.0/go.mod h1:y5HY/iNDFkmFla2CfQoVb2AQXMsBk4ad84iR1PLANB0= +sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE= +sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= +sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU= +sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= +sigs.k8s.io/structured-merge-diff/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/fXCbTiQEco= +sigs.k8s.io/structured-merge-diff/v6 v6.3.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE= +sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs= +sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=