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
The following commit(s) were added to refs/heads/main by this push:
new ec84063 chore(strimzi): upgrade API to v1beta2
ec84063 is described below
commit ec840637294200f593ca3e8fcf9c9dae5ac20109
Author: nicolaferraro <ni.ferr...@gmail.com>
AuthorDate: Wed Aug 25 13:30:41 2021 +0200
chore(strimzi): upgrade API to v1beta2
---
...eta1.go => addtoscheme_strimzi_duck_v1beta2.go} | 4 +-
.../client/internalclientset/clientset.go | 18 +++----
.../{v1beta1 => }/client/internalclientset/doc.go | 0
.../internalclientset/fake/clientset_generated.go | 12 ++---
.../client/internalclientset/fake/doc.go | 0
.../client/internalclientset/fake/register.go | 4 +-
.../client/internalclientset/scheme/doc.go | 0
.../client/internalclientset/scheme/register.go | 4 +-
.../internalclientset/typed/duck/v1beta2}/doc.go | 2 +-
.../typed/duck/v1beta2}/duck_client.go | 36 ++++++-------
.../typed/duck/v1beta2}/fake/doc.go | 0
.../typed/duck/v1beta2}/fake/fake_duck_client.go | 10 ++--
.../typed/duck/v1beta2}/fake/fake_kafka.go | 22 ++++----
.../typed/duck/v1beta2}/fake/fake_kafkatopic.go | 22 ++++----
.../typed/duck/v1beta2}/generated_expansion.go | 2 +-
.../internalclientset/typed/duck/v1beta2}/kafka.go | 20 ++++----
.../typed/duck/v1beta2}/kafkatopic.go | 20 ++++----
addons/strimzi/duck/{v1beta1 => v1beta2}/doc.go | 2 +-
.../duck/{v1beta1 => v1beta2}/duck_types.go | 4 +-
.../strimzi/duck/{v1beta1 => v1beta2}/register.go | 2 +-
.../{v1beta1 => v1beta2}/zz_generated.deepcopy.go | 2 +-
addons/strimzi/strimzi.go | 59 +++++++++++++---------
addons/strimzi/strimzi_test.go | 20 ++++----
pkg/resources/resources.go | 4 +-
script/gen_client_strimzi.sh | 9 ++--
25 files changed, 144 insertions(+), 134 deletions(-)
diff --git a/addons/strimzi/addtoscheme_strimzi_duck_v1beta1.go
b/addons/strimzi/addtoscheme_strimzi_duck_v1beta2.go
similarity index 88%
rename from addons/strimzi/addtoscheme_strimzi_duck_v1beta1.go
rename to addons/strimzi/addtoscheme_strimzi_duck_v1beta2.go
index d4af282..2a4e7e3 100644
--- a/addons/strimzi/addtoscheme_strimzi_duck_v1beta1.go
+++ b/addons/strimzi/addtoscheme_strimzi_duck_v1beta2.go
@@ -18,11 +18,11 @@ limitations under the License.
package strimzi
import (
- "github.com/apache/camel-k/addons/strimzi/duck/v1beta1"
+ "github.com/apache/camel-k/addons/strimzi/duck/v1beta2"
"github.com/apache/camel-k/pkg/apis"
)
func init() {
// Register the types with the Scheme so the components can map objects
to GroupVersionKinds and back
- apis.AddToSchemes = append(apis.AddToSchemes,
v1beta1.SchemeBuilder.AddToScheme)
+ apis.AddToSchemes = append(apis.AddToSchemes,
v1beta2.SchemeBuilder.AddToScheme)
}
diff --git a/addons/strimzi/duck/v1beta1/client/internalclientset/clientset.go
b/addons/strimzi/duck/client/internalclientset/clientset.go
similarity index 84%
rename from addons/strimzi/duck/v1beta1/client/internalclientset/clientset.go
rename to addons/strimzi/duck/client/internalclientset/clientset.go
index 3be1551..0049d2e 100644
--- a/addons/strimzi/duck/v1beta1/client/internalclientset/clientset.go
+++ b/addons/strimzi/duck/client/internalclientset/clientset.go
@@ -22,7 +22,7 @@ package internalclientset
import (
"fmt"
- kafkav1beta1
"github.com/apache/camel-k/addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1"
+ kafkav1beta2
"github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2"
discovery "k8s.io/client-go/discovery"
rest "k8s.io/client-go/rest"
flowcontrol "k8s.io/client-go/util/flowcontrol"
@@ -30,19 +30,19 @@ import (
type Interface interface {
Discovery() discovery.DiscoveryInterface
- KafkaV1beta1() kafkav1beta1.KafkaV1beta1Interface
+ KafkaV1beta2() kafkav1beta2.KafkaV1beta2Interface
}
// Clientset contains the clients for groups. Each group has exactly one
// version included in a Clientset.
type Clientset struct {
*discovery.DiscoveryClient
- kafkaV1beta1 *kafkav1beta1.KafkaV1beta1Client
+ kafkaV1beta2 *kafkav1beta2.KafkaV1beta2Client
}
-// KafkaV1beta1 retrieves the KafkaV1beta1Client
-func (c *Clientset) KafkaV1beta1() kafkav1beta1.KafkaV1beta1Interface {
- return c.kafkaV1beta1
+// KafkaV1beta2 retrieves the KafkaV1beta2Client
+func (c *Clientset) KafkaV1beta2() kafkav1beta2.KafkaV1beta2Interface {
+ return c.kafkaV1beta2
}
// Discovery retrieves the DiscoveryClient
@@ -66,7 +66,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
}
var cs Clientset
var err error
- cs.kafkaV1beta1, err = kafkav1beta1.NewForConfig(&configShallowCopy)
+ cs.kafkaV1beta2, err = kafkav1beta2.NewForConfig(&configShallowCopy)
if err != nil {
return nil, err
}
@@ -82,7 +82,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
// panics if there is an error in the config.
func NewForConfigOrDie(c *rest.Config) *Clientset {
var cs Clientset
- cs.kafkaV1beta1 = kafkav1beta1.NewForConfigOrDie(c)
+ cs.kafkaV1beta2 = kafkav1beta2.NewForConfigOrDie(c)
cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c)
return &cs
@@ -91,7 +91,7 @@ func NewForConfigOrDie(c *rest.Config) *Clientset {
// New creates a new Clientset for the given RESTClient.
func New(c rest.Interface) *Clientset {
var cs Clientset
- cs.kafkaV1beta1 = kafkav1beta1.New(c)
+ cs.kafkaV1beta2 = kafkav1beta2.New(c)
cs.DiscoveryClient = discovery.NewDiscoveryClient(c)
return &cs
diff --git a/addons/strimzi/duck/v1beta1/client/internalclientset/doc.go
b/addons/strimzi/duck/client/internalclientset/doc.go
similarity index 100%
rename from addons/strimzi/duck/v1beta1/client/internalclientset/doc.go
rename to addons/strimzi/duck/client/internalclientset/doc.go
diff --git
a/addons/strimzi/duck/v1beta1/client/internalclientset/fake/clientset_generated.go
b/addons/strimzi/duck/client/internalclientset/fake/clientset_generated.go
similarity index 83%
rename from
addons/strimzi/duck/v1beta1/client/internalclientset/fake/clientset_generated.go
rename to
addons/strimzi/duck/client/internalclientset/fake/clientset_generated.go
index de14238..86f320b 100644
---
a/addons/strimzi/duck/v1beta1/client/internalclientset/fake/clientset_generated.go
+++ b/addons/strimzi/duck/client/internalclientset/fake/clientset_generated.go
@@ -20,9 +20,9 @@ limitations under the License.
package fake
import (
- clientset
"github.com/apache/camel-k/addons/strimzi/duck/v1beta1/client/internalclientset"
- kafkav1beta1
"github.com/apache/camel-k/addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1"
- fakekafkav1beta1
"github.com/apache/camel-k/addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/fake"
+ clientset
"github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset"
+ kafkav1beta2
"github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2"
+ fakekafkav1beta2
"github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/discovery"
@@ -77,7 +77,7 @@ func (c *Clientset) Tracker() testing.ObjectTracker {
var _ clientset.Interface = &Clientset{}
-// KafkaV1beta1 retrieves the KafkaV1beta1Client
-func (c *Clientset) KafkaV1beta1() kafkav1beta1.KafkaV1beta1Interface {
- return &fakekafkav1beta1.FakeKafkaV1beta1{Fake: &c.Fake}
+// KafkaV1beta2 retrieves the KafkaV1beta2Client
+func (c *Clientset) KafkaV1beta2() kafkav1beta2.KafkaV1beta2Interface {
+ return &fakekafkav1beta2.FakeKafkaV1beta2{Fake: &c.Fake}
}
diff --git a/addons/strimzi/duck/v1beta1/client/internalclientset/fake/doc.go
b/addons/strimzi/duck/client/internalclientset/fake/doc.go
similarity index 100%
rename from addons/strimzi/duck/v1beta1/client/internalclientset/fake/doc.go
rename to addons/strimzi/duck/client/internalclientset/fake/doc.go
diff --git
a/addons/strimzi/duck/v1beta1/client/internalclientset/fake/register.go
b/addons/strimzi/duck/client/internalclientset/fake/register.go
similarity index 95%
rename from
addons/strimzi/duck/v1beta1/client/internalclientset/fake/register.go
rename to addons/strimzi/duck/client/internalclientset/fake/register.go
index 1a42ee7..b03a9f8 100644
--- a/addons/strimzi/duck/v1beta1/client/internalclientset/fake/register.go
+++ b/addons/strimzi/duck/client/internalclientset/fake/register.go
@@ -20,7 +20,7 @@ limitations under the License.
package fake
import (
- kafkav1beta1 "github.com/apache/camel-k/addons/strimzi/duck/v1beta1"
+ kafkav1beta2 "github.com/apache/camel-k/addons/strimzi/duck/v1beta2"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -32,7 +32,7 @@ var scheme = runtime.NewScheme()
var codecs = serializer.NewCodecFactory(scheme)
var localSchemeBuilder = runtime.SchemeBuilder{
- kafkav1beta1.AddToScheme,
+ kafkav1beta2.AddToScheme,
}
// AddToScheme adds all types of this clientset into the given scheme. This
allows composition
diff --git a/addons/strimzi/duck/v1beta1/client/internalclientset/scheme/doc.go
b/addons/strimzi/duck/client/internalclientset/scheme/doc.go
similarity index 100%
rename from addons/strimzi/duck/v1beta1/client/internalclientset/scheme/doc.go
rename to addons/strimzi/duck/client/internalclientset/scheme/doc.go
diff --git
a/addons/strimzi/duck/v1beta1/client/internalclientset/scheme/register.go
b/addons/strimzi/duck/client/internalclientset/scheme/register.go
similarity index 95%
rename from
addons/strimzi/duck/v1beta1/client/internalclientset/scheme/register.go
rename to addons/strimzi/duck/client/internalclientset/scheme/register.go
index 4408b11..bb376af 100644
--- a/addons/strimzi/duck/v1beta1/client/internalclientset/scheme/register.go
+++ b/addons/strimzi/duck/client/internalclientset/scheme/register.go
@@ -20,7 +20,7 @@ limitations under the License.
package scheme
import (
- kafkav1beta1 "github.com/apache/camel-k/addons/strimzi/duck/v1beta1"
+ kafkav1beta2 "github.com/apache/camel-k/addons/strimzi/duck/v1beta2"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -32,7 +32,7 @@ var Scheme = runtime.NewScheme()
var Codecs = serializer.NewCodecFactory(Scheme)
var ParameterCodec = runtime.NewParameterCodec(Scheme)
var localSchemeBuilder = runtime.SchemeBuilder{
- kafkav1beta1.AddToScheme,
+ kafkav1beta2.AddToScheme,
}
// AddToScheme adds all types of this clientset into the given scheme. This
allows composition
diff --git
a/addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/doc.go
b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/doc.go
similarity index 98%
rename from
addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/doc.go
rename to addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/doc.go
index 69b5e24..bdba261 100644
---
a/addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/doc.go
+++ b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
// Code generated by client-gen. DO NOT EDIT.
// This package has the automatically generated typed clients.
-package v1beta1
+package v1beta2
diff --git
a/addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/duck_client.go
b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/duck_client.go
similarity index 65%
rename from
addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/duck_client.go
rename to
addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/duck_client.go
index 8608c2a..51c4afd 100644
---
a/addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/duck_client.go
+++
b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/duck_client.go
@@ -17,35 +17,35 @@ limitations under the License.
// Code generated by client-gen. DO NOT EDIT.
-package v1beta1
+package v1beta2
import (
- v1beta1 "github.com/apache/camel-k/addons/strimzi/duck/v1beta1"
-
"github.com/apache/camel-k/addons/strimzi/duck/v1beta1/client/internalclientset/scheme"
+
"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"
)
-type KafkaV1beta1Interface interface {
+type KafkaV1beta2Interface interface {
RESTClient() rest.Interface
KafkasGetter
KafkaTopicsGetter
}
-// KafkaV1beta1Client is used to interact with features provided by the
kafka.strimzi.io group.
-type KafkaV1beta1Client struct {
+// KafkaV1beta2Client is used to interact with features provided by the
kafka.strimzi.io group.
+type KafkaV1beta2Client struct {
restClient rest.Interface
}
-func (c *KafkaV1beta1Client) Kafkas(namespace string) KafkaInterface {
+func (c *KafkaV1beta2Client) Kafkas(namespace string) KafkaInterface {
return newKafkas(c, namespace)
}
-func (c *KafkaV1beta1Client) KafkaTopics(namespace string) KafkaTopicInterface
{
+func (c *KafkaV1beta2Client) KafkaTopics(namespace string) KafkaTopicInterface
{
return newKafkaTopics(c, namespace)
}
-// NewForConfig creates a new KafkaV1beta1Client for the given config.
-func NewForConfig(c *rest.Config) (*KafkaV1beta1Client, error) {
+// NewForConfig creates a new KafkaV1beta2Client for the given config.
+func NewForConfig(c *rest.Config) (*KafkaV1beta2Client, error) {
config := *c
if err := setConfigDefaults(&config); err != nil {
return nil, err
@@ -54,12 +54,12 @@ func NewForConfig(c *rest.Config) (*KafkaV1beta1Client,
error) {
if err != nil {
return nil, err
}
- return &KafkaV1beta1Client{client}, nil
+ return &KafkaV1beta2Client{client}, nil
}
-// NewForConfigOrDie creates a new KafkaV1beta1Client for the given config and
+// NewForConfigOrDie creates a new KafkaV1beta2Client for the given config and
// panics if there is an error in the config.
-func NewForConfigOrDie(c *rest.Config) *KafkaV1beta1Client {
+func NewForConfigOrDie(c *rest.Config) *KafkaV1beta2Client {
client, err := NewForConfig(c)
if err != nil {
panic(err)
@@ -67,13 +67,13 @@ func NewForConfigOrDie(c *rest.Config) *KafkaV1beta1Client {
return client
}
-// New creates a new KafkaV1beta1Client for the given RESTClient.
-func New(c rest.Interface) *KafkaV1beta1Client {
- return &KafkaV1beta1Client{c}
+// New creates a new KafkaV1beta2Client for the given RESTClient.
+func New(c rest.Interface) *KafkaV1beta2Client {
+ return &KafkaV1beta2Client{c}
}
func setConfigDefaults(config *rest.Config) error {
- gv := v1beta1.SchemeGroupVersion
+ gv := v1beta2.SchemeGroupVersion
config.GroupVersion = &gv
config.APIPath = "/apis"
config.NegotiatedSerializer = scheme.Codecs.WithoutConversion()
@@ -87,7 +87,7 @@ func setConfigDefaults(config *rest.Config) error {
// RESTClient returns a RESTClient that is used to communicate
// with API server by this client implementation.
-func (c *KafkaV1beta1Client) RESTClient() rest.Interface {
+func (c *KafkaV1beta2Client) RESTClient() rest.Interface {
if c == nil {
return nil
}
diff --git
a/addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/fake/doc.go
b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/doc.go
similarity index 100%
rename from
addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/fake/doc.go
rename to
addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/doc.go
diff --git
a/addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/fake/fake_duck_client.go
b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_duck_client.go
similarity index 78%
rename from
addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/fake/fake_duck_client.go
rename to
addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_duck_client.go
index bfeb3b9..bdf43d5 100644
---
a/addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/fake/fake_duck_client.go
+++
b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_duck_client.go
@@ -20,26 +20,26 @@ limitations under the License.
package fake
import (
- v1beta1
"github.com/apache/camel-k/addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1"
+ v1beta2
"github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2"
rest "k8s.io/client-go/rest"
testing "k8s.io/client-go/testing"
)
-type FakeKafkaV1beta1 struct {
+type FakeKafkaV1beta2 struct {
*testing.Fake
}
-func (c *FakeKafkaV1beta1) Kafkas(namespace string) v1beta1.KafkaInterface {
+func (c *FakeKafkaV1beta2) Kafkas(namespace string) v1beta2.KafkaInterface {
return &FakeKafkas{c, namespace}
}
-func (c *FakeKafkaV1beta1) KafkaTopics(namespace string)
v1beta1.KafkaTopicInterface {
+func (c *FakeKafkaV1beta2) KafkaTopics(namespace string)
v1beta2.KafkaTopicInterface {
return &FakeKafkaTopics{c, namespace}
}
// RESTClient returns a RESTClient that is used to communicate
// with API server by this client implementation.
-func (c *FakeKafkaV1beta1) RESTClient() rest.Interface {
+func (c *FakeKafkaV1beta2) RESTClient() rest.Interface {
var ret *rest.RESTClient
return ret
}
diff --git
a/addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/fake/fake_kafka.go
b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_kafka.go
similarity index 83%
rename from
addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/fake/fake_kafka.go
rename to
addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_kafka.go
index 878a2d0..93acdff 100644
---
a/addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/fake/fake_kafka.go
+++
b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_kafka.go
@@ -22,7 +22,7 @@ package fake
import (
"context"
- v1beta1 "github.com/apache/camel-k/addons/strimzi/duck/v1beta1"
+ v1beta2 "github.com/apache/camel-k/addons/strimzi/duck/v1beta2"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -32,29 +32,29 @@ import (
// FakeKafkas implements KafkaInterface
type FakeKafkas struct {
- Fake *FakeKafkaV1beta1
+ Fake *FakeKafkaV1beta2
ns string
}
-var kafkasResource = schema.GroupVersionResource{Group: "kafka.strimzi.io",
Version: "v1beta1", Resource: "kafkas"}
+var kafkasResource = schema.GroupVersionResource{Group: "kafka.strimzi.io",
Version: "v1beta2", Resource: "kafkas"}
-var kafkasKind = schema.GroupVersionKind{Group: "kafka.strimzi.io", Version:
"v1beta1", Kind: "Kafka"}
+var kafkasKind = schema.GroupVersionKind{Group: "kafka.strimzi.io", Version:
"v1beta2", Kind: "Kafka"}
// Get takes name of the kafka, and returns the corresponding kafka object,
and an error if there is any.
-func (c *FakeKafkas) Get(ctx context.Context, name string, options
v1.GetOptions) (result *v1beta1.Kafka, err error) {
+func (c *FakeKafkas) Get(ctx context.Context, name string, options
v1.GetOptions) (result *v1beta2.Kafka, err error) {
obj, err := c.Fake.
- Invokes(testing.NewGetAction(kafkasResource, c.ns, name),
&v1beta1.Kafka{})
+ Invokes(testing.NewGetAction(kafkasResource, c.ns, name),
&v1beta2.Kafka{})
if obj == nil {
return nil, err
}
- return obj.(*v1beta1.Kafka), err
+ return obj.(*v1beta2.Kafka), err
}
// List takes label and field selectors, and returns the list of Kafkas that
match those selectors.
-func (c *FakeKafkas) List(ctx context.Context, opts v1.ListOptions) (result
*v1beta1.KafkaList, err error) {
+func (c *FakeKafkas) List(ctx context.Context, opts v1.ListOptions) (result
*v1beta2.KafkaList, err error) {
obj, err := c.Fake.
- Invokes(testing.NewListAction(kafkasResource, kafkasKind, c.ns,
opts), &v1beta1.KafkaList{})
+ Invokes(testing.NewListAction(kafkasResource, kafkasKind, c.ns,
opts), &v1beta2.KafkaList{})
if obj == nil {
return nil, err
@@ -64,8 +64,8 @@ func (c *FakeKafkas) List(ctx context.Context, opts
v1.ListOptions) (result *v1b
if label == nil {
label = labels.Everything()
}
- list := &v1beta1.KafkaList{ListMeta: obj.(*v1beta1.KafkaList).ListMeta}
- for _, item := range obj.(*v1beta1.KafkaList).Items {
+ list := &v1beta2.KafkaList{ListMeta: obj.(*v1beta2.KafkaList).ListMeta}
+ for _, item := range obj.(*v1beta2.KafkaList).Items {
if label.Matches(labels.Set(item.Labels)) {
list.Items = append(list.Items, item)
}
diff --git
a/addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/fake/fake_kafkatopic.go
b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_kafkatopic.go
similarity index 81%
rename from
addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/fake/fake_kafkatopic.go
rename to
addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_kafkatopic.go
index 063db41..50298e6 100644
---
a/addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/fake/fake_kafkatopic.go
+++
b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_kafkatopic.go
@@ -22,7 +22,7 @@ package fake
import (
"context"
- v1beta1 "github.com/apache/camel-k/addons/strimzi/duck/v1beta1"
+ v1beta2 "github.com/apache/camel-k/addons/strimzi/duck/v1beta2"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -32,29 +32,29 @@ import (
// FakeKafkaTopics implements KafkaTopicInterface
type FakeKafkaTopics struct {
- Fake *FakeKafkaV1beta1
+ Fake *FakeKafkaV1beta2
ns string
}
-var kafkatopicsResource = schema.GroupVersionResource{Group:
"kafka.strimzi.io", Version: "v1beta1", Resource: "kafkatopics"}
+var kafkatopicsResource = schema.GroupVersionResource{Group:
"kafka.strimzi.io", Version: "v1beta2", Resource: "kafkatopics"}
-var kafkatopicsKind = schema.GroupVersionKind{Group: "kafka.strimzi.io",
Version: "v1beta1", Kind: "KafkaTopic"}
+var kafkatopicsKind = schema.GroupVersionKind{Group: "kafka.strimzi.io",
Version: "v1beta2", Kind: "KafkaTopic"}
// Get takes name of the kafkaTopic, and returns the corresponding kafkaTopic
object, and an error if there is any.
-func (c *FakeKafkaTopics) Get(ctx context.Context, name string, options
v1.GetOptions) (result *v1beta1.KafkaTopic, err error) {
+func (c *FakeKafkaTopics) Get(ctx context.Context, name string, options
v1.GetOptions) (result *v1beta2.KafkaTopic, err error) {
obj, err := c.Fake.
- Invokes(testing.NewGetAction(kafkatopicsResource, c.ns, name),
&v1beta1.KafkaTopic{})
+ Invokes(testing.NewGetAction(kafkatopicsResource, c.ns, name),
&v1beta2.KafkaTopic{})
if obj == nil {
return nil, err
}
- return obj.(*v1beta1.KafkaTopic), err
+ return obj.(*v1beta2.KafkaTopic), err
}
// List takes label and field selectors, and returns the list of KafkaTopics
that match those selectors.
-func (c *FakeKafkaTopics) List(ctx context.Context, opts v1.ListOptions)
(result *v1beta1.KafkaTopicList, err error) {
+func (c *FakeKafkaTopics) List(ctx context.Context, opts v1.ListOptions)
(result *v1beta2.KafkaTopicList, err error) {
obj, err := c.Fake.
- Invokes(testing.NewListAction(kafkatopicsResource,
kafkatopicsKind, c.ns, opts), &v1beta1.KafkaTopicList{})
+ Invokes(testing.NewListAction(kafkatopicsResource,
kafkatopicsKind, c.ns, opts), &v1beta2.KafkaTopicList{})
if obj == nil {
return nil, err
@@ -64,8 +64,8 @@ func (c *FakeKafkaTopics) List(ctx context.Context, opts
v1.ListOptions) (result
if label == nil {
label = labels.Everything()
}
- list := &v1beta1.KafkaTopicList{ListMeta:
obj.(*v1beta1.KafkaTopicList).ListMeta}
- for _, item := range obj.(*v1beta1.KafkaTopicList).Items {
+ list := &v1beta2.KafkaTopicList{ListMeta:
obj.(*v1beta2.KafkaTopicList).ListMeta}
+ for _, item := range obj.(*v1beta2.KafkaTopicList).Items {
if label.Matches(labels.Set(item.Labels)) {
list.Items = append(list.Items, item)
}
diff --git
a/addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/generated_expansion.go
b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/generated_expansion.go
similarity index 98%
rename from
addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/generated_expansion.go
rename to
addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/generated_expansion.go
index 218890c..b02c214 100644
---
a/addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/generated_expansion.go
+++
b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/generated_expansion.go
@@ -17,7 +17,7 @@ limitations under the License.
// Code generated by client-gen. DO NOT EDIT.
-package v1beta1
+package v1beta2
type KafkaExpansion interface{}
diff --git
a/addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/kafka.go
b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/kafka.go
similarity index 85%
rename from
addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/kafka.go
rename to
addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/kafka.go
index 4a2cfbd..e27f9c2 100644
---
a/addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/kafka.go
+++ b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/kafka.go
@@ -17,14 +17,14 @@ limitations under the License.
// Code generated by client-gen. DO NOT EDIT.
-package v1beta1
+package v1beta2
import (
"context"
"time"
- v1beta1 "github.com/apache/camel-k/addons/strimzi/duck/v1beta1"
- scheme
"github.com/apache/camel-k/addons/strimzi/duck/v1beta1/client/internalclientset/scheme"
+ scheme
"github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset/scheme"
+ v1beta2 "github.com/apache/camel-k/addons/strimzi/duck/v1beta2"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
watch "k8s.io/apimachinery/pkg/watch"
rest "k8s.io/client-go/rest"
@@ -38,8 +38,8 @@ type KafkasGetter interface {
// KafkaInterface has methods to work with Kafka resources.
type KafkaInterface interface {
- Get(ctx context.Context, name string, opts v1.GetOptions)
(*v1beta1.Kafka, error)
- List(ctx context.Context, opts v1.ListOptions) (*v1beta1.KafkaList,
error)
+ Get(ctx context.Context, name string, opts v1.GetOptions)
(*v1beta2.Kafka, error)
+ List(ctx context.Context, opts v1.ListOptions) (*v1beta2.KafkaList,
error)
Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
KafkaExpansion
}
@@ -51,7 +51,7 @@ type kafkas struct {
}
// newKafkas returns a Kafkas
-func newKafkas(c *KafkaV1beta1Client, namespace string) *kafkas {
+func newKafkas(c *KafkaV1beta2Client, namespace string) *kafkas {
return &kafkas{
client: c.RESTClient(),
ns: namespace,
@@ -59,8 +59,8 @@ func newKafkas(c *KafkaV1beta1Client, namespace string)
*kafkas {
}
// Get takes name of the kafka, and returns the corresponding kafka object,
and an error if there is any.
-func (c *kafkas) Get(ctx context.Context, name string, options v1.GetOptions)
(result *v1beta1.Kafka, err error) {
- result = &v1beta1.Kafka{}
+func (c *kafkas) Get(ctx context.Context, name string, options v1.GetOptions)
(result *v1beta2.Kafka, err error) {
+ result = &v1beta2.Kafka{}
err = c.client.Get().
Namespace(c.ns).
Resource("kafkas").
@@ -72,12 +72,12 @@ func (c *kafkas) Get(ctx context.Context, name string,
options v1.GetOptions) (r
}
// List takes label and field selectors, and returns the list of Kafkas that
match those selectors.
-func (c *kafkas) List(ctx context.Context, opts v1.ListOptions) (result
*v1beta1.KafkaList, err error) {
+func (c *kafkas) List(ctx context.Context, opts v1.ListOptions) (result
*v1beta2.KafkaList, err error) {
var timeout time.Duration
if opts.TimeoutSeconds != nil {
timeout = time.Duration(*opts.TimeoutSeconds) * time.Second
}
- result = &v1beta1.KafkaList{}
+ result = &v1beta2.KafkaList{}
err = c.client.Get().
Namespace(c.ns).
Resource("kafkas").
diff --git
a/addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/kafkatopic.go
b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/kafkatopic.go
similarity index 85%
rename from
addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/kafkatopic.go
rename to
addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/kafkatopic.go
index 5179ec5..3be380f 100644
---
a/addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1/kafkatopic.go
+++
b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/kafkatopic.go
@@ -17,14 +17,14 @@ limitations under the License.
// Code generated by client-gen. DO NOT EDIT.
-package v1beta1
+package v1beta2
import (
"context"
"time"
- v1beta1 "github.com/apache/camel-k/addons/strimzi/duck/v1beta1"
- scheme
"github.com/apache/camel-k/addons/strimzi/duck/v1beta1/client/internalclientset/scheme"
+ scheme
"github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset/scheme"
+ v1beta2 "github.com/apache/camel-k/addons/strimzi/duck/v1beta2"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
watch "k8s.io/apimachinery/pkg/watch"
rest "k8s.io/client-go/rest"
@@ -38,8 +38,8 @@ type KafkaTopicsGetter interface {
// KafkaTopicInterface has methods to work with KafkaTopic resources.
type KafkaTopicInterface interface {
- Get(ctx context.Context, name string, opts v1.GetOptions)
(*v1beta1.KafkaTopic, error)
- List(ctx context.Context, opts v1.ListOptions)
(*v1beta1.KafkaTopicList, error)
+ Get(ctx context.Context, name string, opts v1.GetOptions)
(*v1beta2.KafkaTopic, error)
+ List(ctx context.Context, opts v1.ListOptions)
(*v1beta2.KafkaTopicList, error)
Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
KafkaTopicExpansion
}
@@ -51,7 +51,7 @@ type kafkaTopics struct {
}
// newKafkaTopics returns a KafkaTopics
-func newKafkaTopics(c *KafkaV1beta1Client, namespace string) *kafkaTopics {
+func newKafkaTopics(c *KafkaV1beta2Client, namespace string) *kafkaTopics {
return &kafkaTopics{
client: c.RESTClient(),
ns: namespace,
@@ -59,8 +59,8 @@ func newKafkaTopics(c *KafkaV1beta1Client, namespace string)
*kafkaTopics {
}
// Get takes name of the kafkaTopic, and returns the corresponding kafkaTopic
object, and an error if there is any.
-func (c *kafkaTopics) Get(ctx context.Context, name string, options
v1.GetOptions) (result *v1beta1.KafkaTopic, err error) {
- result = &v1beta1.KafkaTopic{}
+func (c *kafkaTopics) Get(ctx context.Context, name string, options
v1.GetOptions) (result *v1beta2.KafkaTopic, err error) {
+ result = &v1beta2.KafkaTopic{}
err = c.client.Get().
Namespace(c.ns).
Resource("kafkatopics").
@@ -72,12 +72,12 @@ func (c *kafkaTopics) Get(ctx context.Context, name string,
options v1.GetOption
}
// List takes label and field selectors, and returns the list of KafkaTopics
that match those selectors.
-func (c *kafkaTopics) List(ctx context.Context, opts v1.ListOptions) (result
*v1beta1.KafkaTopicList, err error) {
+func (c *kafkaTopics) List(ctx context.Context, opts v1.ListOptions) (result
*v1beta2.KafkaTopicList, err error) {
var timeout time.Duration
if opts.TimeoutSeconds != nil {
timeout = time.Duration(*opts.TimeoutSeconds) * time.Second
}
- result = &v1beta1.KafkaTopicList{}
+ result = &v1beta2.KafkaTopicList{}
err = c.client.Get().
Namespace(c.ns).
Resource("kafkatopics").
diff --git a/addons/strimzi/duck/v1beta1/doc.go
b/addons/strimzi/duck/v1beta2/doc.go
similarity index 98%
rename from addons/strimzi/duck/v1beta1/doc.go
rename to addons/strimzi/duck/v1beta2/doc.go
index 0c9ca9f..26d9567 100644
--- a/addons/strimzi/duck/v1beta1/doc.go
+++ b/addons/strimzi/duck/v1beta2/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
// Package duck contains a partial schema of the Strimzi APIs
// +kubebuilder:object:generate=true
// +groupName=kafka.strimzi.io
-package v1beta1
+package v1beta2
diff --git a/addons/strimzi/duck/v1beta1/duck_types.go
b/addons/strimzi/duck/v1beta2/duck_types.go
similarity index 97%
rename from addons/strimzi/duck/v1beta1/duck_types.go
rename to addons/strimzi/duck/v1beta2/duck_types.go
index c691549..7e23933 100644
--- a/addons/strimzi/duck/v1beta1/duck_types.go
+++ b/addons/strimzi/duck/v1beta2/duck_types.go
@@ -16,13 +16,13 @@ limitations under the License.
*/
// Package duck contains duck-types for accessing Strimzi resources
-package v1beta1
+package v1beta2
import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
const (
StrimziGroup = "kafka.strimzi.io"
- StrimziVersion = "v1beta1"
+ StrimziVersion = "v1beta2"
StrimziKindTopic = "KafkaTopic"
StrimziKindKafkaCluster = "Kafka"
diff --git a/addons/strimzi/duck/v1beta1/register.go
b/addons/strimzi/duck/v1beta2/register.go
similarity index 99%
rename from addons/strimzi/duck/v1beta1/register.go
rename to addons/strimzi/duck/v1beta2/register.go
index 203ddee..c48a9fc 100644
--- a/addons/strimzi/duck/v1beta1/register.go
+++ b/addons/strimzi/duck/v1beta2/register.go
@@ -15,7 +15,7 @@ See the License for the specific language governing
permissions and
limitations under the License.
*/
-package v1beta1
+package v1beta2
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/addons/strimzi/duck/v1beta1/zz_generated.deepcopy.go
b/addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go
similarity index 99%
rename from addons/strimzi/duck/v1beta1/zz_generated.deepcopy.go
rename to addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go
index 7b7e8fa..6a7dd3b 100644
--- a/addons/strimzi/duck/v1beta1/zz_generated.deepcopy.go
+++ b/addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go
@@ -2,7 +2,7 @@
// Code generated by controller-gen. DO NOT EDIT.
-package v1beta1
+package v1beta2
import (
"k8s.io/apimachinery/pkg/runtime"
diff --git a/addons/strimzi/strimzi.go b/addons/strimzi/strimzi.go
index 582c5a7..167d251 100644
--- a/addons/strimzi/strimzi.go
+++ b/addons/strimzi/strimzi.go
@@ -21,9 +21,8 @@ package strimzi
import (
"fmt"
- "github.com/apache/camel-k/addons/strimzi/duck/v1beta1"
-
"github.com/apache/camel-k/addons/strimzi/duck/v1beta1/client/internalclientset"
- typedclient
"github.com/apache/camel-k/addons/strimzi/duck/v1beta1/client/internalclientset/typed/duck/v1beta1"
+ "github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset"
+ "github.com/apache/camel-k/addons/strimzi/duck/v1beta2"
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/pkg/util/bindings"
"github.com/apache/camel-k/pkg/util/uri"
@@ -33,7 +32,7 @@ import (
// StrimziBindingProvider allows to connect to a Kafka topic via KameletBinding
type StrimziBindingProvider struct {
- Client typedclient.KafkaV1beta1Interface
+ Client internalclientset.Interface
}
func (s StrimziBindingProvider) ID() string {
@@ -50,7 +49,7 @@ func (s StrimziBindingProvider) Translate(ctx
bindings.BindingContext, _ binding
return nil, err
}
- if gv.Group != v1beta1.StrimziGroup || endpoint.Ref.Kind !=
v1beta1.StrimziKindTopic {
+ if gv.Group != v1beta2.StrimziGroup || endpoint.Ref.Kind !=
v1beta2.StrimziKindTopic {
// Only operates on Strimzi Topics
return nil, nil
}
@@ -70,40 +69,26 @@ func (s StrimziBindingProvider) Translate(ctx
bindings.BindingContext, _ binding
if err != nil {
return nil, err
}
- s.Client = kafkaClient.KafkaV1beta1()
+ s.Client = kafkaClient
}
// look them up
- topic, err := s.Client.KafkaTopics(ctx.Namespace).Get(ctx.Ctx,
endpoint.Ref.Name, v1.GetOptions{})
+ topic, err :=
s.Client.KafkaV1beta2().KafkaTopics(ctx.Namespace).Get(ctx.Ctx,
endpoint.Ref.Name, v1.GetOptions{})
if err != nil {
return nil, err
}
- clusterName := topic.Labels[v1beta1.StrimziKafkaClusterLabel]
+ clusterName := topic.Labels[v1beta2.StrimziKafkaClusterLabel]
if clusterName == "" {
- return nil, fmt.Errorf("no %q label defined on topic
%s", v1beta1.StrimziKafkaClusterLabel, endpoint.Ref.Name)
+ return nil, fmt.Errorf("no %q label defined on topic
%s", v1beta2.StrimziKafkaClusterLabel, endpoint.Ref.Name)
}
- cluster, err := s.Client.Kafkas(ctx.Namespace).Get(ctx.Ctx,
clusterName, v1.GetOptions{})
+ bootstrapServers, err := s.getBootstrapServers(ctx, clusterName)
if err != nil {
return nil, err
}
- var listener *v1beta1.KafkaStatusListener
- for _, l := range cluster.Status.Listeners {
- if l.Type == v1beta1.StrimziListenerTypePlain {
- listener = &l
- break
- }
- }
-
- if listener == nil {
- return nil, fmt.Errorf("cluster %q has no listeners of
type %q", clusterName, v1beta1.StrimziListenerTypePlain)
- }
- if listener.BootstrapServers == "" {
- return nil, fmt.Errorf("cluster %q has no bootstrap
servers in %q listener", clusterName, v1beta1.StrimziListenerTypePlain)
- }
- props["brokers"] = listener.BootstrapServers
+ props["brokers"] = bootstrapServers
}
kafkaURI := fmt.Sprintf("kafka:%s", endpoint.Ref.Name)
@@ -114,6 +99,30 @@ func (s StrimziBindingProvider) Translate(ctx
bindings.BindingContext, _ binding
}, nil
}
+func (s StrimziBindingProvider) getBootstrapServers(ctx
bindings.BindingContext, clusterName string) (string, error) {
+ cluster, err :=
s.Client.KafkaV1beta2().Kafkas(ctx.Namespace).Get(ctx.Ctx, clusterName,
v1.GetOptions{})
+ if err != nil {
+ return "", err
+ }
+
+ var listener *v1beta2.KafkaStatusListener
+ for _, l := range cluster.Status.Listeners {
+ if l.Type == v1beta2.StrimziListenerTypePlain {
+ listener = &l
+ break
+ }
+ }
+
+ if listener == nil {
+ return "", fmt.Errorf("cluster %q has no listeners of type %q",
clusterName, v1beta2.StrimziListenerTypePlain)
+ }
+ if listener.BootstrapServers == "" {
+ return "", fmt.Errorf("cluster %q has no bootstrap servers in
%q listener", clusterName, v1beta2.StrimziListenerTypePlain)
+ }
+
+ return listener.BootstrapServers, nil
+}
+
func (s StrimziBindingProvider) Order() int {
return bindings.OrderStandard
}
diff --git a/addons/strimzi/strimzi_test.go b/addons/strimzi/strimzi_test.go
index 7769b7a..34b9d08 100644
--- a/addons/strimzi/strimzi_test.go
+++ b/addons/strimzi/strimzi_test.go
@@ -22,8 +22,8 @@ import (
"encoding/json"
"testing"
- "github.com/apache/camel-k/addons/strimzi/duck/v1beta1"
-
"github.com/apache/camel-k/addons/strimzi/duck/v1beta1/client/internalclientset/fake"
+
"github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset/fake"
+ "github.com/apache/camel-k/addons/strimzi/duck/v1beta2"
camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/pkg/util/bindings"
@@ -51,7 +51,7 @@ func TestStrimziDirect(t *testing.T) {
Ref: &v1.ObjectReference{
Kind: "KafkaTopic",
Name: "mytopic",
- APIVersion: "kafka.strimzi.io/v1beta1",
+ APIVersion: "kafka.strimzi.io/v1beta2",
},
Properties: asEndpointProperties(map[string]string{
"brokers": "my-cluster-kafka-bootstrap:9092",
@@ -71,13 +71,13 @@ func TestStrimziLookup(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
- cluster := v1beta1.Kafka{
+ cluster := v1beta2.Kafka{
ObjectMeta: metav1.ObjectMeta{
Namespace: "test",
Name: "myclusterx",
},
- Status: v1beta1.KafkaStatus{
- Listeners: []v1beta1.KafkaStatusListener{
+ Status: v1beta2.KafkaStatus{
+ Listeners: []v1beta2.KafkaStatusListener{
{
Type: "tls",
},
@@ -89,19 +89,19 @@ func TestStrimziLookup(t *testing.T) {
},
}
- topic := v1beta1.KafkaTopic{
+ topic := v1beta2.KafkaTopic{
ObjectMeta: metav1.ObjectMeta{
Namespace: "test",
Name: "mytopicy",
Labels: map[string]string{
- v1beta1.StrimziKafkaClusterLabel: "myclusterx",
+ v1beta2.StrimziKafkaClusterLabel: "myclusterx",
},
},
}
client := fake.NewSimpleClientset(&cluster, &topic)
provider := StrimziBindingProvider{
- Client: client.KafkaV1beta1(),
+ Client: client,
}
bindingContext := bindings.BindingContext{
@@ -114,7 +114,7 @@ func TestStrimziLookup(t *testing.T) {
Ref: &v1.ObjectReference{
Kind: "KafkaTopic",
Name: "mytopicy",
- APIVersion: "kafka.strimzi.io/v1beta1",
+ APIVersion: "kafka.strimzi.io/v1beta2",
},
}
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index fb6bcb3..c7261f8 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -467,9 +467,9 @@ var assets = func() http.FileSystem {
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
modTime: time.Time{},
- uncompressedSize: 39124,
+ uncompressedSize: 39128,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x7b\x73\x24\xb7\xf1\xd8\xff\xf7\x29\x50\xfc\xa5\xea\x48\xd6\xee\xf0\x24\xc7\xb6\xc2\x44\x71\x51\x77\x27\x8b\xd2\x3d\x98\x23\x2d\x57\x4a\x51\x79\xb1\x33\xbd\xbb\x38\x62\x80\x31\x80\x21\x6f\x1d\xe7\xbb\xa7\xd0\x8d\xd7\xec\x0e\x97\xcb\x93\xa8\x12\x53\xb1\xff\xd0\x91\x9c\x01\x1a\x8d\x7e\xbf\xc6\x19\x2e\x9c\x3d\x7d\x36\x65\x8a\xb7\x70\xca\xf8\x62\x21\x94\x70\xeb\x67\x8c\x75\x92\xbb\x85\x36\xed\x29\x5b\x70\x69\xc1\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x7b\x73\x24\xb7\xf1\xd8\xff\xf7\x29\x50\xfc\xa5\xea\x48\xd6\xee\xf0\x24\xc7\xb6\xc2\x44\x71\x51\x77\x27\x8b\xd2\x3d\x98\x23\x2d\x57\x4a\x51\x79\xb1\x33\xbd\xbb\x38\x62\x80\x31\x80\x21\x6f\x1d\xe7\xbb\xa7\xd0\x8d\xd7\xec\x0e\x97\xcb\x93\xa8\x12\x53\xb1\xff\xd0\x91\x9c\x69\x34\x1a\x8d\x7e\x77\x8f\x33\x5c\x38\x7b\xfa\x6c\xca\x14\x6f\xe1\x94\xf1\xc5\x42\x28\xe1\xd6\xcf\x18\xeb\x24\x77\x0b\x6d\xda\x53\xb6\xe0\xd2\x
[...]
},
}
fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
diff --git a/script/gen_client_strimzi.sh b/script/gen_client_strimzi.sh
index f882f78..0a467f7 100755
--- a/script/gen_client_strimzi.sh
+++ b/script/gen_client_strimzi.sh
@@ -29,11 +29,12 @@ cd $rootdir
go run k8s.io/code-generator/cmd/client-gen \
-h script/headers/default.txt \
- --input duck/v1beta1 \
+ --input duck/v1beta2 \
--input-base=github.com/apache/camel-k/addons/strimzi \
- --output-package=github.com/apache/camel-k/addons/strimzi/duck/v1beta1/client
+ --output-package=github.com/apache/camel-k/addons/strimzi/duck/client
+rm -r ./addons/strimzi/duck/client || true
+
+mv github.com/apache/camel-k/addons/strimzi/duck/client ./addons/strimzi/duck/
-rm -r ./addons/strimzi/duck/v1beta1/client || true
-mv github.com/apache/camel-k/addons/strimzi/duck/v1beta1/client
./addons/strimzi/duck/v1beta1/
rm -r ./github.com
