This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit d9192376cee5fac405b1cd3298d96e2a7e1e8049 Author: Antonin Stefanutti <[email protected]> AuthorDate: Thu Aug 18 17:38:40 2022 +0200 chore: Upgrade code-generator to v0.23.5 --- .../duck/client/internalclientset/clientset.go | 34 ++++++++++++++++---- .../typed/duck/v1beta2/duck_client.go | 20 +++++++++++- pkg/client/camel/clientset/versioned/clientset.go | 37 ++++++++++++++++------ .../versioned/typed/camel/v1/camel_client.go | 20 +++++++++++- .../versioned/typed/camel/v1/fake/fake_build.go | 2 +- .../typed/camel/v1/fake/fake_camelcatalog.go | 2 +- .../typed/camel/v1/fake/fake_integration.go | 2 +- .../typed/camel/v1/fake/fake_integrationkit.go | 2 +- .../camel/v1/fake/fake_integrationplatform.go | 2 +- .../versioned/typed/camel/v1alpha1/camel_client.go | 20 +++++++++++- .../typed/camel/v1alpha1/fake/fake_kamelet.go | 2 +- .../camel/v1alpha1/fake/fake_kameletbinding.go | 2 +- script/Makefile | 2 +- 13 files changed, 120 insertions(+), 27 deletions(-) diff --git a/addons/strimzi/duck/client/internalclientset/clientset.go b/addons/strimzi/duck/client/internalclientset/clientset.go index 0049d2ea2..2446af8e3 100644 --- a/addons/strimzi/duck/client/internalclientset/clientset.go +++ b/addons/strimzi/duck/client/internalclientset/clientset.go @@ -21,6 +21,7 @@ package internalclientset import ( "fmt" + "net/http" kafkav1beta2 "github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2" discovery "k8s.io/client-go/discovery" @@ -56,22 +57,41 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { // NewForConfig creates a new Clientset for the given config. // If config's RateLimiter is not set and QPS and Burst are acceptable, // NewForConfig will generate a rate-limiter in configShallowCopy. +// NewForConfig is equivalent to NewForConfigAndClient(c, httpClient), +// where httpClient was generated with rest.HTTPClientFor(c). func NewForConfig(c *rest.Config) (*Clientset, error) { configShallowCopy := *c + + // share the transport between all clients + httpClient, err := rest.HTTPClientFor(&configShallowCopy) + if err != nil { + return nil, err + } + + return NewForConfigAndClient(&configShallowCopy, httpClient) +} + +// NewForConfigAndClient creates a new Clientset for the given config and http client. +// Note the http client provided takes precedence over the configured transport values. +// If config's RateLimiter is not set and QPS and Burst are acceptable, +// NewForConfigAndClient will generate a rate-limiter in configShallowCopy. +func NewForConfigAndClient(c *rest.Config, httpClient *http.Client) (*Clientset, error) { + configShallowCopy := *c if configShallowCopy.RateLimiter == nil && configShallowCopy.QPS > 0 { if configShallowCopy.Burst <= 0 { return nil, fmt.Errorf("burst is required to be greater than 0 when RateLimiter is not set and QPS is set to greater than 0") } configShallowCopy.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(configShallowCopy.QPS, configShallowCopy.Burst) } + var cs Clientset var err error - cs.kafkaV1beta2, err = kafkav1beta2.NewForConfig(&configShallowCopy) + cs.kafkaV1beta2, err = kafkav1beta2.NewForConfigAndClient(&configShallowCopy, httpClient) if err != nil { return nil, err } - cs.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy) + cs.DiscoveryClient, err = discovery.NewDiscoveryClientForConfigAndClient(&configShallowCopy, httpClient) if err != nil { return nil, err } @@ -81,11 +101,11 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { // NewForConfigOrDie creates a new Clientset for the given config and // panics if there is an error in the config. func NewForConfigOrDie(c *rest.Config) *Clientset { - var cs Clientset - cs.kafkaV1beta2 = kafkav1beta2.NewForConfigOrDie(c) - - cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) - return &cs + cs, err := NewForConfig(c) + if err != nil { + panic(err) + } + return cs } // New creates a new Clientset for the given RESTClient. diff --git a/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/duck_client.go b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/duck_client.go index 51c4afd1a..542445b16 100644 --- a/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/duck_client.go +++ b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/duck_client.go @@ -20,6 +20,8 @@ limitations under the License. package v1beta2 import ( + "net/http" + "github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset/scheme" v1beta2 "github.com/apache/camel-k/addons/strimzi/duck/v1beta2" rest "k8s.io/client-go/rest" @@ -45,12 +47,28 @@ func (c *KafkaV1beta2Client) KafkaTopics(namespace string) KafkaTopicInterface { } // NewForConfig creates a new KafkaV1beta2Client for the given config. +// NewForConfig is equivalent to NewForConfigAndClient(c, httpClient), +// where httpClient was generated with rest.HTTPClientFor(c). func NewForConfig(c *rest.Config) (*KafkaV1beta2Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := rest.RESTClientFor(&config) + httpClient, err := rest.HTTPClientFor(&config) + if err != nil { + return nil, err + } + return NewForConfigAndClient(&config, httpClient) +} + +// NewForConfigAndClient creates a new KafkaV1beta2Client for the given config and http client. +// Note the http client provided takes precedence over the configured transport values. +func NewForConfigAndClient(c *rest.Config, h *http.Client) (*KafkaV1beta2Client, error) { + config := *c + if err := setConfigDefaults(&config); err != nil { + return nil, err + } + client, err := rest.RESTClientForConfigAndClient(&config, h) if err != nil { return nil, err } diff --git a/pkg/client/camel/clientset/versioned/clientset.go b/pkg/client/camel/clientset/versioned/clientset.go index 50e90d00c..1812c4fe3 100644 --- a/pkg/client/camel/clientset/versioned/clientset.go +++ b/pkg/client/camel/clientset/versioned/clientset.go @@ -21,6 +21,7 @@ package versioned import ( "fmt" + "net/http" camelv1 "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/typed/camel/v1" camelv1alpha1 "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1" @@ -64,26 +65,45 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { // NewForConfig creates a new Clientset for the given config. // If config's RateLimiter is not set and QPS and Burst are acceptable, // NewForConfig will generate a rate-limiter in configShallowCopy. +// NewForConfig is equivalent to NewForConfigAndClient(c, httpClient), +// where httpClient was generated with rest.HTTPClientFor(c). func NewForConfig(c *rest.Config) (*Clientset, error) { configShallowCopy := *c + + // share the transport between all clients + httpClient, err := rest.HTTPClientFor(&configShallowCopy) + if err != nil { + return nil, err + } + + return NewForConfigAndClient(&configShallowCopy, httpClient) +} + +// NewForConfigAndClient creates a new Clientset for the given config and http client. +// Note the http client provided takes precedence over the configured transport values. +// If config's RateLimiter is not set and QPS and Burst are acceptable, +// NewForConfigAndClient will generate a rate-limiter in configShallowCopy. +func NewForConfigAndClient(c *rest.Config, httpClient *http.Client) (*Clientset, error) { + configShallowCopy := *c if configShallowCopy.RateLimiter == nil && configShallowCopy.QPS > 0 { if configShallowCopy.Burst <= 0 { return nil, fmt.Errorf("burst is required to be greater than 0 when RateLimiter is not set and QPS is set to greater than 0") } configShallowCopy.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(configShallowCopy.QPS, configShallowCopy.Burst) } + var cs Clientset var err error - cs.camelV1, err = camelv1.NewForConfig(&configShallowCopy) + cs.camelV1, err = camelv1.NewForConfigAndClient(&configShallowCopy, httpClient) if err != nil { return nil, err } - cs.camelV1alpha1, err = camelv1alpha1.NewForConfig(&configShallowCopy) + cs.camelV1alpha1, err = camelv1alpha1.NewForConfigAndClient(&configShallowCopy, httpClient) if err != nil { return nil, err } - cs.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy) + cs.DiscoveryClient, err = discovery.NewDiscoveryClientForConfigAndClient(&configShallowCopy, httpClient) if err != nil { return nil, err } @@ -93,12 +113,11 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { // NewForConfigOrDie creates a new Clientset for the given config and // panics if there is an error in the config. func NewForConfigOrDie(c *rest.Config) *Clientset { - var cs Clientset - cs.camelV1 = camelv1.NewForConfigOrDie(c) - cs.camelV1alpha1 = camelv1alpha1.NewForConfigOrDie(c) - - cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) - return &cs + cs, err := NewForConfig(c) + if err != nil { + panic(err) + } + return cs } // New creates a new Clientset for the given RESTClient. diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1/camel_client.go b/pkg/client/camel/clientset/versioned/typed/camel/v1/camel_client.go index 8fd6f8756..050322dac 100644 --- a/pkg/client/camel/clientset/versioned/typed/camel/v1/camel_client.go +++ b/pkg/client/camel/clientset/versioned/typed/camel/v1/camel_client.go @@ -20,6 +20,8 @@ limitations under the License. package v1 import ( + "net/http" + v1 "github.com/apache/camel-k/pkg/apis/camel/v1" "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/scheme" rest "k8s.io/client-go/rest" @@ -60,12 +62,28 @@ func (c *CamelV1Client) IntegrationPlatforms(namespace string) IntegrationPlatfo } // NewForConfig creates a new CamelV1Client for the given config. +// NewForConfig is equivalent to NewForConfigAndClient(c, httpClient), +// where httpClient was generated with rest.HTTPClientFor(c). func NewForConfig(c *rest.Config) (*CamelV1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := rest.RESTClientFor(&config) + httpClient, err := rest.HTTPClientFor(&config) + if err != nil { + return nil, err + } + return NewForConfigAndClient(&config, httpClient) +} + +// NewForConfigAndClient creates a new CamelV1Client for the given config and http client. +// Note the http client provided takes precedence over the configured transport values. +func NewForConfigAndClient(c *rest.Config, h *http.Client) (*CamelV1Client, error) { + config := *c + if err := setConfigDefaults(&config); err != nil { + return nil, err + } + client, err := rest.RESTClientForConfigAndClient(&config, h) if err != nil { return nil, err } diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_build.go b/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_build.go index de095246b..b00748a08 100644 --- a/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_build.go +++ b/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_build.go @@ -118,7 +118,7 @@ func (c *FakeBuilds) UpdateStatus(ctx context.Context, build *camelv1.Build, opt // Delete takes name of the build and deletes it. Returns an error if one occurs. func (c *FakeBuilds) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(buildsResource, c.ns, name), &camelv1.Build{}) + Invokes(testing.NewDeleteActionWithOptions(buildsResource, c.ns, name, opts), &camelv1.Build{}) return err } diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_camelcatalog.go b/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_camelcatalog.go index e40b258e2..e4408c88e 100644 --- a/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_camelcatalog.go +++ b/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_camelcatalog.go @@ -118,7 +118,7 @@ func (c *FakeCamelCatalogs) UpdateStatus(ctx context.Context, camelCatalog *came // Delete takes name of the camelCatalog and deletes it. Returns an error if one occurs. func (c *FakeCamelCatalogs) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(camelcatalogsResource, c.ns, name), &camelv1.CamelCatalog{}) + Invokes(testing.NewDeleteActionWithOptions(camelcatalogsResource, c.ns, name, opts), &camelv1.CamelCatalog{}) return err } diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integration.go b/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integration.go index 7a976f609..0c729b36c 100644 --- a/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integration.go +++ b/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integration.go @@ -119,7 +119,7 @@ func (c *FakeIntegrations) UpdateStatus(ctx context.Context, integration *camelv // Delete takes name of the integration and deletes it. Returns an error if one occurs. func (c *FakeIntegrations) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(integrationsResource, c.ns, name), &camelv1.Integration{}) + Invokes(testing.NewDeleteActionWithOptions(integrationsResource, c.ns, name, opts), &camelv1.Integration{}) return err } diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integrationkit.go b/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integrationkit.go index 8aa86b792..4785e8cb1 100644 --- a/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integrationkit.go +++ b/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integrationkit.go @@ -118,7 +118,7 @@ func (c *FakeIntegrationKits) UpdateStatus(ctx context.Context, integrationKit * // Delete takes name of the integrationKit and deletes it. Returns an error if one occurs. func (c *FakeIntegrationKits) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(integrationkitsResource, c.ns, name), &camelv1.IntegrationKit{}) + Invokes(testing.NewDeleteActionWithOptions(integrationkitsResource, c.ns, name, opts), &camelv1.IntegrationKit{}) return err } diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integrationplatform.go b/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integrationplatform.go index 88eea38c7..d9d12bb15 100644 --- a/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integrationplatform.go +++ b/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integrationplatform.go @@ -118,7 +118,7 @@ func (c *FakeIntegrationPlatforms) UpdateStatus(ctx context.Context, integration // Delete takes name of the integrationPlatform and deletes it. Returns an error if one occurs. func (c *FakeIntegrationPlatforms) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(integrationplatformsResource, c.ns, name), &camelv1.IntegrationPlatform{}) + Invokes(testing.NewDeleteActionWithOptions(integrationplatformsResource, c.ns, name, opts), &camelv1.IntegrationPlatform{}) return err } diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/camel_client.go b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/camel_client.go index e78e1b685..675eb1224 100644 --- a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/camel_client.go +++ b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/camel_client.go @@ -20,6 +20,8 @@ limitations under the License. package v1alpha1 import ( + "net/http" + v1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1" "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/scheme" rest "k8s.io/client-go/rest" @@ -45,12 +47,28 @@ func (c *CamelV1alpha1Client) KameletBindings(namespace string) KameletBindingIn } // NewForConfig creates a new CamelV1alpha1Client for the given config. +// NewForConfig is equivalent to NewForConfigAndClient(c, httpClient), +// where httpClient was generated with rest.HTTPClientFor(c). func NewForConfig(c *rest.Config) (*CamelV1alpha1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := rest.RESTClientFor(&config) + httpClient, err := rest.HTTPClientFor(&config) + if err != nil { + return nil, err + } + return NewForConfigAndClient(&config, httpClient) +} + +// NewForConfigAndClient creates a new CamelV1alpha1Client for the given config and http client. +// Note the http client provided takes precedence over the configured transport values. +func NewForConfigAndClient(c *rest.Config, h *http.Client) (*CamelV1alpha1Client, error) { + config := *c + if err := setConfigDefaults(&config); err != nil { + return nil, err + } + client, err := rest.RESTClientForConfigAndClient(&config, h) if err != nil { return nil, err } diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_kamelet.go b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_kamelet.go index ad2ac9894..b0cd19fef 100644 --- a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_kamelet.go +++ b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_kamelet.go @@ -118,7 +118,7 @@ func (c *FakeKamelets) UpdateStatus(ctx context.Context, kamelet *v1alpha1.Kamel // Delete takes name of the kamelet and deletes it. Returns an error if one occurs. func (c *FakeKamelets) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(kameletsResource, c.ns, name), &v1alpha1.Kamelet{}) + Invokes(testing.NewDeleteActionWithOptions(kameletsResource, c.ns, name, opts), &v1alpha1.Kamelet{}) return err } diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_kameletbinding.go b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_kameletbinding.go index 3d0044410..71fc98f3c 100644 --- a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_kameletbinding.go +++ b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_kameletbinding.go @@ -119,7 +119,7 @@ func (c *FakeKameletBindings) UpdateStatus(ctx context.Context, kameletBinding * // Delete takes name of the kameletBinding and deletes it. Returns an error if one occurs. func (c *FakeKameletBindings) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(kameletbindingsResource, c.ns, name), &v1alpha1.KameletBinding{}) + Invokes(testing.NewDeleteActionWithOptions(kameletbindingsResource, c.ns, name, opts), &v1alpha1.KameletBinding{}) return err } diff --git a/script/Makefile b/script/Makefile index 6d159f2e6..0895d7e12 100644 --- a/script/Makefile +++ b/script/Makefile @@ -22,7 +22,7 @@ BUILDAH_VERSION := 1.23.3 KANIKO_VERSION := 0.17.1 INSTALL_DEFAULT_KAMELETS := true CONTROLLER_GEN_VERSION := v0.6.1 -CODEGEN_VERSION := v0.22.5 +CODEGEN_VERSION := v0.23.5 OPERATOR_SDK_VERSION := v1.14.0 KUSTOMIZE_VERSION := v4.1.2 OPM_VERSION := v1.21.0
