You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2026/05/05 14:52:24 UTC
(camel-k) 02/03: chore(api): migrate strimzi duck types and client bindings from v1beta2 to v1
This is an automated email from the ASF dual-hosted git repository.
squakez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit bbbc71bc975c6af6c415c93dfe3559eb2b3089fe
Author: anand3559 <an...@gmail.com>
AuthorDate: Mon May 4 14:34:02 2026 +0530
chore(api): migrate strimzi duck types and client bindings from v1beta2 to v1
Strimzi v1beta2 APIs are no longer supported and have been replaced by v1.
This commit migrates the Camel-K strimzi duck types from `v1beta2` to `v1`.
- Renames duck types package and references from `v1beta2` to `v1`
- Updates schema registration to point to the `v1` API group
- Regenerates Kubernetes clientset and deepcopy functions for `strimzi/v1`
- Refactors `pkg/util/bindings` provider to utilize the new `KafkaV1` client
---
...k_v1beta2.go => addtoscheme_strimzi_duck_v1.go} | 4 +-
pkg/apis/duck/strimzi/{v1beta2 => v1}/doc.go | 4 +-
.../duck/strimzi/{v1beta2 => v1}/duck_types.go | 4 +-
pkg/apis/duck/strimzi/{v1beta2 => v1}/register.go | 2 +-
.../{v1beta2 => v1}/zz_generated.deepcopy.go | 2 +-
.../clientset/internalclientset/clientset.go | 16 +++----
.../internalclientset/fake/clientset_generated.go | 10 ++---
.../clientset/internalclientset/fake/register.go | 4 +-
.../clientset/internalclientset/scheme/register.go | 4 +-
.../typed/strimzi/{v1beta2 => v1}/doc.go | 2 +-
.../typed/strimzi/{v1beta2 => v1}/fake/doc.go | 0
.../strimzi/{v1beta2 => v1}/fake/fake_kafka.go | 26 +++++------
.../fake_kafka.go => v1/fake/fake_kafkatopic.go} | 32 +++++++-------
.../{v1beta2 => v1}/fake/fake_strimzi_client.go | 10 ++---
.../strimzi/{v1beta2 => v1}/generated_expansion.go | 2 +-
.../typed/strimzi/{v1beta2 => v1}/kafka.go | 22 +++++-----
.../typed/strimzi/{v1beta2 => v1}/kafkatopic.go | 22 +++++-----
.../strimzi/{v1beta2 => v1}/strimzi_client.go | 38 ++++++++--------
.../typed/strimzi/v1beta2/fake/fake_kafkatopic.go | 51 ----------------------
pkg/util/bindings/strimzi.go | 28 ++++++------
pkg/util/bindings/strimzi_test.go | 36 +++++++--------
script/gen_client.sh | 2 +-
22 files changed, 135 insertions(+), 186 deletions(-)
diff --git a/pkg/apis/addtoscheme_strimzi_duck_v1beta2.go b/pkg/apis/addtoscheme_strimzi_duck_v1.go
similarity index 87%
rename from pkg/apis/addtoscheme_strimzi_duck_v1beta2.go
rename to pkg/apis/addtoscheme_strimzi_duck_v1.go
index 17dcc9de5..0e8c5b8c7 100644
--- a/pkg/apis/addtoscheme_strimzi_duck_v1beta2.go
+++ b/pkg/apis/addtoscheme_strimzi_duck_v1.go
@@ -18,10 +18,10 @@ limitations under the License.
package apis
import (
- "github.com/apache/camel-k/v2/pkg/apis/duck/strimzi/v1beta2"
+ "github.com/apache/camel-k/v2/pkg/apis/duck/strimzi/v1"
)
func init() {
// Register the types with the Scheme so the components can map objects to GroupVersionKinds and back
- AddToSchemes = append(AddToSchemes, v1beta2.SchemeBuilder.AddToScheme)
+ AddToSchemes = append(AddToSchemes, v1.SchemeBuilder.AddToScheme)
}
diff --git a/pkg/apis/duck/strimzi/v1beta2/doc.go b/pkg/apis/duck/strimzi/v1/doc.go
similarity index 91%
rename from pkg/apis/duck/strimzi/v1beta2/doc.go
rename to pkg/apis/duck/strimzi/v1/doc.go
index e069e5b34..069d4b993 100644
--- a/pkg/apis/duck/strimzi/v1beta2/doc.go
+++ b/pkg/apis/duck/strimzi/v1/doc.go
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-// Package v1beta2 contains a partial schema of the Strimzi APIs
+// Package v1 contains a partial schema of the Strimzi APIs
// +kubebuilder:object:generate=true
// +groupName=kafka.strimzi.io
-package v1beta2
+package v1
diff --git a/pkg/apis/duck/strimzi/v1beta2/duck_types.go b/pkg/apis/duck/strimzi/v1/duck_types.go
similarity index 97%
rename from pkg/apis/duck/strimzi/v1beta2/duck_types.go
rename to pkg/apis/duck/strimzi/v1/duck_types.go
index cb305d6d8..451ac8fb0 100644
--- a/pkg/apis/duck/strimzi/v1beta2/duck_types.go
+++ b/pkg/apis/duck/strimzi/v1/duck_types.go
@@ -15,13 +15,13 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package v1beta2
+package v1
import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
const (
StrimziGroup = "kafka.strimzi.io"
- StrimziVersion = "v1beta2"
+ StrimziVersion = "v1"
StrimziKindTopic = "KafkaTopic"
StrimziKindKafkaCluster = "Kafka"
diff --git a/pkg/apis/duck/strimzi/v1beta2/register.go b/pkg/apis/duck/strimzi/v1/register.go
similarity index 98%
rename from pkg/apis/duck/strimzi/v1beta2/register.go
rename to pkg/apis/duck/strimzi/v1/register.go
index d98c86408..7436c470b 100644
--- a/pkg/apis/duck/strimzi/v1beta2/register.go
+++ b/pkg/apis/duck/strimzi/v1/register.go
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package v1beta2
+package v1
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/apis/duck/strimzi/v1beta2/zz_generated.deepcopy.go b/pkg/apis/duck/strimzi/v1/zz_generated.deepcopy.go
similarity index 99%
rename from pkg/apis/duck/strimzi/v1beta2/zz_generated.deepcopy.go
rename to pkg/apis/duck/strimzi/v1/zz_generated.deepcopy.go
index 20ac56983..fbfa9fff5 100644
--- a/pkg/apis/duck/strimzi/v1beta2/zz_generated.deepcopy.go
+++ b/pkg/apis/duck/strimzi/v1/zz_generated.deepcopy.go
@@ -2,7 +2,7 @@
// Code generated by controller-gen. DO NOT EDIT.
-package v1beta2
+package v1
import (
"k8s.io/apimachinery/pkg/runtime"
diff --git a/pkg/client/strimzi/clientset/internalclientset/clientset.go b/pkg/client/strimzi/clientset/internalclientset/clientset.go
index c908155ee..b541982dc 100644
--- a/pkg/client/strimzi/clientset/internalclientset/clientset.go
+++ b/pkg/client/strimzi/clientset/internalclientset/clientset.go
@@ -23,7 +23,7 @@ import (
fmt "fmt"
http "net/http"
- kafkav1beta2 "github.com/apache/camel-k/v2/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2"
+ kafkav1 "github.com/apache/camel-k/v2/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1"
discovery "k8s.io/client-go/discovery"
rest "k8s.io/client-go/rest"
flowcontrol "k8s.io/client-go/util/flowcontrol"
@@ -31,18 +31,18 @@ import (
type Interface interface {
Discovery() discovery.DiscoveryInterface
- KafkaV1beta2() kafkav1beta2.KafkaV1beta2Interface
+ KafkaV1() kafkav1.KafkaV1Interface
}
// Clientset contains the clients for groups.
type Clientset struct {
*discovery.DiscoveryClient
- kafkaV1beta2 *kafkav1beta2.KafkaV1beta2Client
+ kafkaV1 *kafkav1.KafkaV1Client
}
-// KafkaV1beta2 retrieves the KafkaV1beta2Client
-func (c *Clientset) KafkaV1beta2() kafkav1beta2.KafkaV1beta2Interface {
- return c.kafkaV1beta2
+// KafkaV1 retrieves the KafkaV1Client
+func (c *Clientset) KafkaV1() kafkav1.KafkaV1Interface {
+ return c.kafkaV1
}
// Discovery retrieves the DiscoveryClient
@@ -89,7 +89,7 @@ func NewForConfigAndClient(c *rest.Config, httpClient *http.Client) (*Clientset,
var cs Clientset
var err error
- cs.kafkaV1beta2, err = kafkav1beta2.NewForConfigAndClient(&configShallowCopy, httpClient)
+ cs.kafkaV1, err = kafkav1.NewForConfigAndClient(&configShallowCopy, httpClient)
if err != nil {
return nil, err
}
@@ -114,7 +114,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.kafkaV1beta2 = kafkav1beta2.New(c)
+ cs.kafkaV1 = kafkav1.New(c)
cs.DiscoveryClient = discovery.NewDiscoveryClient(c)
return &cs
diff --git a/pkg/client/strimzi/clientset/internalclientset/fake/clientset_generated.go b/pkg/client/strimzi/clientset/internalclientset/fake/clientset_generated.go
index 26067cab4..6721e2e22 100644
--- a/pkg/client/strimzi/clientset/internalclientset/fake/clientset_generated.go
+++ b/pkg/client/strimzi/clientset/internalclientset/fake/clientset_generated.go
@@ -21,8 +21,8 @@ package fake
import (
clientset "github.com/apache/camel-k/v2/pkg/client/strimzi/clientset/internalclientset"
- kafkav1beta2 "github.com/apache/camel-k/v2/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2"
- fakekafkav1beta2 "github.com/apache/camel-k/v2/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/fake"
+ kafkav1 "github.com/apache/camel-k/v2/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1"
+ fakekafkav1 "github.com/apache/camel-k/v2/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/fake"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"
@@ -100,7 +100,7 @@ var (
_ testing.FakeClient = &Clientset{}
)
-// KafkaV1beta2 retrieves the KafkaV1beta2Client
-func (c *Clientset) KafkaV1beta2() kafkav1beta2.KafkaV1beta2Interface {
- return &fakekafkav1beta2.FakeKafkaV1beta2{Fake: &c.Fake}
+// KafkaV1 retrieves the KafkaV1Client
+func (c *Clientset) KafkaV1() kafkav1.KafkaV1Interface {
+ return &fakekafkav1.FakeKafkaV1{Fake: &c.Fake}
}
diff --git a/pkg/client/strimzi/clientset/internalclientset/fake/register.go b/pkg/client/strimzi/clientset/internalclientset/fake/register.go
index 1795e1629..21b7f4f1b 100644
--- a/pkg/client/strimzi/clientset/internalclientset/fake/register.go
+++ b/pkg/client/strimzi/clientset/internalclientset/fake/register.go
@@ -20,7 +20,7 @@ limitations under the License.
package fake
import (
- kafkav1beta2 "github.com/apache/camel-k/v2/pkg/apis/duck/strimzi/v1beta2"
+ kafkav1 "github.com/apache/camel-k/v2/pkg/apis/duck/strimzi/v1"
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{
- kafkav1beta2.AddToScheme,
+ kafkav1.AddToScheme,
}
// AddToScheme adds all types of this clientset into the given scheme. This allows composition
diff --git a/pkg/client/strimzi/clientset/internalclientset/scheme/register.go b/pkg/client/strimzi/clientset/internalclientset/scheme/register.go
index 71e7cd0e5..d7bc6a99a 100644
--- a/pkg/client/strimzi/clientset/internalclientset/scheme/register.go
+++ b/pkg/client/strimzi/clientset/internalclientset/scheme/register.go
@@ -20,7 +20,7 @@ limitations under the License.
package scheme
import (
- kafkav1beta2 "github.com/apache/camel-k/v2/pkg/apis/duck/strimzi/v1beta2"
+ kafkav1 "github.com/apache/camel-k/v2/pkg/apis/duck/strimzi/v1"
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{
- kafkav1beta2.AddToScheme,
+ kafkav1.AddToScheme,
}
// AddToScheme adds all types of this clientset into the given scheme. This allows composition
diff --git a/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/doc.go b/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/doc.go
similarity index 98%
rename from pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/doc.go
rename to pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/doc.go
index bdba261f6..cbd710d63 100644
--- a/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/doc.go
+++ b/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/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 v1beta2
+package v1
diff --git a/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/fake/doc.go b/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/fake/doc.go
similarity index 100%
rename from pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/fake/doc.go
rename to pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/fake/doc.go
diff --git a/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/fake/fake_kafka.go b/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/fake/fake_kafka.go
similarity index 51%
copy from pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/fake/fake_kafka.go
copy to pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/fake/fake_kafka.go
index 8fd31a32e..60e812714 100644
--- a/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/fake/fake_kafka.go
+++ b/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/fake/fake_kafka.go
@@ -20,29 +20,29 @@ limitations under the License.
package fake
import (
- v1beta2 "github.com/apache/camel-k/v2/pkg/apis/duck/strimzi/v1beta2"
- strimziv1beta2 "github.com/apache/camel-k/v2/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/duck/strimzi/v1"
+ strimziv1 "github.com/apache/camel-k/v2/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1"
gentype "k8s.io/client-go/gentype"
)
// fakeKafkas implements KafkaInterface
type fakeKafkas struct {
- *gentype.FakeClientWithList[*v1beta2.Kafka, *v1beta2.KafkaList]
- Fake *FakeKafkaV1beta2
+ *gentype.FakeClientWithList[*v1.Kafka, *v1.KafkaList]
+ Fake *FakeKafkaV1
}
-func newFakeKafkas(fake *FakeKafkaV1beta2, namespace string) strimziv1beta2.KafkaInterface {
+func newFakeKafkas(fake *FakeKafkaV1, namespace string) strimziv1.KafkaInterface {
return &fakeKafkas{
- gentype.NewFakeClientWithList[*v1beta2.Kafka, *v1beta2.KafkaList](
+ gentype.NewFakeClientWithList[*v1.Kafka, *v1.KafkaList](
fake.Fake,
namespace,
- v1beta2.SchemeGroupVersion.WithResource("kafkas"),
- v1beta2.SchemeGroupVersion.WithKind("Kafka"),
- func() *v1beta2.Kafka { return &v1beta2.Kafka{} },
- func() *v1beta2.KafkaList { return &v1beta2.KafkaList{} },
- func(dst, src *v1beta2.KafkaList) { dst.ListMeta = src.ListMeta },
- func(list *v1beta2.KafkaList) []*v1beta2.Kafka { return gentype.ToPointerSlice(list.Items) },
- func(list *v1beta2.KafkaList, items []*v1beta2.Kafka) { list.Items = gentype.FromPointerSlice(items) },
+ v1.SchemeGroupVersion.WithResource("kafkas"),
+ v1.SchemeGroupVersion.WithKind("Kafka"),
+ func() *v1.Kafka { return &v1.Kafka{} },
+ func() *v1.KafkaList { return &v1.KafkaList{} },
+ func(dst, src *v1.KafkaList) { dst.ListMeta = src.ListMeta },
+ func(list *v1.KafkaList) []*v1.Kafka { return gentype.ToPointerSlice(list.Items) },
+ func(list *v1.KafkaList, items []*v1.Kafka) { list.Items = gentype.FromPointerSlice(items) },
),
fake,
}
diff --git a/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/fake/fake_kafka.go b/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/fake/fake_kafkatopic.go
similarity index 52%
rename from pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/fake/fake_kafka.go
rename to pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/fake/fake_kafkatopic.go
index 8fd31a32e..5e3ee6055 100644
--- a/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/fake/fake_kafka.go
+++ b/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/fake/fake_kafkatopic.go
@@ -20,29 +20,29 @@ limitations under the License.
package fake
import (
- v1beta2 "github.com/apache/camel-k/v2/pkg/apis/duck/strimzi/v1beta2"
- strimziv1beta2 "github.com/apache/camel-k/v2/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/duck/strimzi/v1"
+ strimziv1 "github.com/apache/camel-k/v2/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1"
gentype "k8s.io/client-go/gentype"
)
-// fakeKafkas implements KafkaInterface
-type fakeKafkas struct {
- *gentype.FakeClientWithList[*v1beta2.Kafka, *v1beta2.KafkaList]
- Fake *FakeKafkaV1beta2
+// fakeKafkaTopics implements KafkaTopicInterface
+type fakeKafkaTopics struct {
+ *gentype.FakeClientWithList[*v1.KafkaTopic, *v1.KafkaTopicList]
+ Fake *FakeKafkaV1
}
-func newFakeKafkas(fake *FakeKafkaV1beta2, namespace string) strimziv1beta2.KafkaInterface {
- return &fakeKafkas{
- gentype.NewFakeClientWithList[*v1beta2.Kafka, *v1beta2.KafkaList](
+func newFakeKafkaTopics(fake *FakeKafkaV1, namespace string) strimziv1.KafkaTopicInterface {
+ return &fakeKafkaTopics{
+ gentype.NewFakeClientWithList[*v1.KafkaTopic, *v1.KafkaTopicList](
fake.Fake,
namespace,
- v1beta2.SchemeGroupVersion.WithResource("kafkas"),
- v1beta2.SchemeGroupVersion.WithKind("Kafka"),
- func() *v1beta2.Kafka { return &v1beta2.Kafka{} },
- func() *v1beta2.KafkaList { return &v1beta2.KafkaList{} },
- func(dst, src *v1beta2.KafkaList) { dst.ListMeta = src.ListMeta },
- func(list *v1beta2.KafkaList) []*v1beta2.Kafka { return gentype.ToPointerSlice(list.Items) },
- func(list *v1beta2.KafkaList, items []*v1beta2.Kafka) { list.Items = gentype.FromPointerSlice(items) },
+ v1.SchemeGroupVersion.WithResource("kafkatopics"),
+ v1.SchemeGroupVersion.WithKind("KafkaTopic"),
+ func() *v1.KafkaTopic { return &v1.KafkaTopic{} },
+ func() *v1.KafkaTopicList { return &v1.KafkaTopicList{} },
+ func(dst, src *v1.KafkaTopicList) { dst.ListMeta = src.ListMeta },
+ func(list *v1.KafkaTopicList) []*v1.KafkaTopic { return gentype.ToPointerSlice(list.Items) },
+ func(list *v1.KafkaTopicList, items []*v1.KafkaTopic) { list.Items = gentype.FromPointerSlice(items) },
),
fake,
}
diff --git a/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/fake/fake_strimzi_client.go b/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/fake/fake_strimzi_client.go
similarity index 76%
rename from pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/fake/fake_strimzi_client.go
rename to pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/fake/fake_strimzi_client.go
index d8f81a445..dd2f76138 100644
--- a/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/fake/fake_strimzi_client.go
+++ b/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/fake/fake_strimzi_client.go
@@ -20,26 +20,26 @@ limitations under the License.
package fake
import (
- v1beta2 "github.com/apache/camel-k/v2/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2"
+ v1 "github.com/apache/camel-k/v2/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1"
rest "k8s.io/client-go/rest"
testing "k8s.io/client-go/testing"
)
-type FakeKafkaV1beta2 struct {
+type FakeKafkaV1 struct {
*testing.Fake
}
-func (c *FakeKafkaV1beta2) Kafkas(namespace string) v1beta2.KafkaInterface {
+func (c *FakeKafkaV1) Kafkas(namespace string) v1.KafkaInterface {
return newFakeKafkas(c, namespace)
}
-func (c *FakeKafkaV1beta2) KafkaTopics(namespace string) v1beta2.KafkaTopicInterface {
+func (c *FakeKafkaV1) KafkaTopics(namespace string) v1.KafkaTopicInterface {
return newFakeKafkaTopics(c, namespace)
}
// RESTClient returns a RESTClient that is used to communicate
// with API server by this client implementation.
-func (c *FakeKafkaV1beta2) RESTClient() rest.Interface {
+func (c *FakeKafkaV1) RESTClient() rest.Interface {
var ret *rest.RESTClient
return ret
}
diff --git a/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/generated_expansion.go b/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/generated_expansion.go
similarity index 98%
rename from pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/generated_expansion.go
rename to pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/generated_expansion.go
index b02c214fe..740f043d4 100644
--- a/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/generated_expansion.go
+++ b/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/generated_expansion.go
@@ -17,7 +17,7 @@ limitations under the License.
// Code generated by client-gen. DO NOT EDIT.
-package v1beta2
+package v1
type KafkaExpansion interface{}
diff --git a/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/kafka.go b/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/kafka.go
similarity index 66%
rename from pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/kafka.go
rename to pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/kafka.go
index d7945cb9e..f41eb1b10 100644
--- a/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/kafka.go
+++ b/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/kafka.go
@@ -17,14 +17,14 @@ limitations under the License.
// Code generated by client-gen. DO NOT EDIT.
-package v1beta2
+package v1
import (
context "context"
- strimziv1beta2 "github.com/apache/camel-k/v2/pkg/apis/duck/strimzi/v1beta2"
+ strimziv1 "github.com/apache/camel-k/v2/pkg/apis/duck/strimzi/v1"
scheme "github.com/apache/camel-k/v2/pkg/client/strimzi/clientset/internalclientset/scheme"
- v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
watch "k8s.io/apimachinery/pkg/watch"
gentype "k8s.io/client-go/gentype"
)
@@ -37,27 +37,27 @@ type KafkasGetter interface {
// KafkaInterface has methods to work with Kafka resources.
type KafkaInterface interface {
- Get(ctx context.Context, name string, opts v1.GetOptions) (*strimziv1beta2.Kafka, error)
- List(ctx context.Context, opts v1.ListOptions) (*strimziv1beta2.KafkaList, error)
- Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
+ Get(ctx context.Context, name string, opts metav1.GetOptions) (*strimziv1.Kafka, error)
+ List(ctx context.Context, opts metav1.ListOptions) (*strimziv1.KafkaList, error)
+ Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error)
KafkaExpansion
}
// kafkas implements KafkaInterface
type kafkas struct {
- *gentype.ClientWithList[*strimziv1beta2.Kafka, *strimziv1beta2.KafkaList]
+ *gentype.ClientWithList[*strimziv1.Kafka, *strimziv1.KafkaList]
}
// newKafkas returns a Kafkas
-func newKafkas(c *KafkaV1beta2Client, namespace string) *kafkas {
+func newKafkas(c *KafkaV1Client, namespace string) *kafkas {
return &kafkas{
- gentype.NewClientWithList[*strimziv1beta2.Kafka, *strimziv1beta2.KafkaList](
+ gentype.NewClientWithList[*strimziv1.Kafka, *strimziv1.KafkaList](
"kafkas",
c.RESTClient(),
scheme.ParameterCodec,
namespace,
- func() *strimziv1beta2.Kafka { return &strimziv1beta2.Kafka{} },
- func() *strimziv1beta2.KafkaList { return &strimziv1beta2.KafkaList{} },
+ func() *strimziv1.Kafka { return &strimziv1.Kafka{} },
+ func() *strimziv1.KafkaList { return &strimziv1.KafkaList{} },
),
}
}
diff --git a/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/kafkatopic.go b/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/kafkatopic.go
similarity index 66%
rename from pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/kafkatopic.go
rename to pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/kafkatopic.go
index 8b05607db..a7a32a9ba 100644
--- a/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/kafkatopic.go
+++ b/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/kafkatopic.go
@@ -17,14 +17,14 @@ limitations under the License.
// Code generated by client-gen. DO NOT EDIT.
-package v1beta2
+package v1
import (
context "context"
- strimziv1beta2 "github.com/apache/camel-k/v2/pkg/apis/duck/strimzi/v1beta2"
+ strimziv1 "github.com/apache/camel-k/v2/pkg/apis/duck/strimzi/v1"
scheme "github.com/apache/camel-k/v2/pkg/client/strimzi/clientset/internalclientset/scheme"
- v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
watch "k8s.io/apimachinery/pkg/watch"
gentype "k8s.io/client-go/gentype"
)
@@ -37,27 +37,27 @@ type KafkaTopicsGetter interface {
// KafkaTopicInterface has methods to work with KafkaTopic resources.
type KafkaTopicInterface interface {
- Get(ctx context.Context, name string, opts v1.GetOptions) (*strimziv1beta2.KafkaTopic, error)
- List(ctx context.Context, opts v1.ListOptions) (*strimziv1beta2.KafkaTopicList, error)
- Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
+ Get(ctx context.Context, name string, opts metav1.GetOptions) (*strimziv1.KafkaTopic, error)
+ List(ctx context.Context, opts metav1.ListOptions) (*strimziv1.KafkaTopicList, error)
+ Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error)
KafkaTopicExpansion
}
// kafkaTopics implements KafkaTopicInterface
type kafkaTopics struct {
- *gentype.ClientWithList[*strimziv1beta2.KafkaTopic, *strimziv1beta2.KafkaTopicList]
+ *gentype.ClientWithList[*strimziv1.KafkaTopic, *strimziv1.KafkaTopicList]
}
// newKafkaTopics returns a KafkaTopics
-func newKafkaTopics(c *KafkaV1beta2Client, namespace string) *kafkaTopics {
+func newKafkaTopics(c *KafkaV1Client, namespace string) *kafkaTopics {
return &kafkaTopics{
- gentype.NewClientWithList[*strimziv1beta2.KafkaTopic, *strimziv1beta2.KafkaTopicList](
+ gentype.NewClientWithList[*strimziv1.KafkaTopic, *strimziv1.KafkaTopicList](
"kafkatopics",
c.RESTClient(),
scheme.ParameterCodec,
namespace,
- func() *strimziv1beta2.KafkaTopic { return &strimziv1beta2.KafkaTopic{} },
- func() *strimziv1beta2.KafkaTopicList { return &strimziv1beta2.KafkaTopicList{} },
+ func() *strimziv1.KafkaTopic { return &strimziv1.KafkaTopic{} },
+ func() *strimziv1.KafkaTopicList { return &strimziv1.KafkaTopicList{} },
),
}
}
diff --git a/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/strimzi_client.go b/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/strimzi_client.go
similarity index 68%
rename from pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/strimzi_client.go
rename to pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/strimzi_client.go
index 9b5eed13d..82a670fcf 100644
--- a/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/strimzi_client.go
+++ b/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1/strimzi_client.go
@@ -17,39 +17,39 @@ limitations under the License.
// Code generated by client-gen. DO NOT EDIT.
-package v1beta2
+package v1
import (
http "net/http"
- strimziv1beta2 "github.com/apache/camel-k/v2/pkg/apis/duck/strimzi/v1beta2"
+ strimziv1 "github.com/apache/camel-k/v2/pkg/apis/duck/strimzi/v1"
scheme "github.com/apache/camel-k/v2/pkg/client/strimzi/clientset/internalclientset/scheme"
rest "k8s.io/client-go/rest"
)
-type KafkaV1beta2Interface interface {
+type KafkaV1Interface interface {
RESTClient() rest.Interface
KafkasGetter
KafkaTopicsGetter
}
-// KafkaV1beta2Client is used to interact with features provided by the kafka.strimzi.io group.
-type KafkaV1beta2Client struct {
+// KafkaV1Client is used to interact with features provided by the kafka.strimzi.io group.
+type KafkaV1Client struct {
restClient rest.Interface
}
-func (c *KafkaV1beta2Client) Kafkas(namespace string) KafkaInterface {
+func (c *KafkaV1Client) Kafkas(namespace string) KafkaInterface {
return newKafkas(c, namespace)
}
-func (c *KafkaV1beta2Client) KafkaTopics(namespace string) KafkaTopicInterface {
+func (c *KafkaV1Client) KafkaTopics(namespace string) KafkaTopicInterface {
return newKafkaTopics(c, namespace)
}
-// NewForConfig creates a new KafkaV1beta2Client for the given config.
+// NewForConfig creates a new KafkaV1Client 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) {
+func NewForConfig(c *rest.Config) (*KafkaV1Client, error) {
config := *c
setConfigDefaults(&config)
httpClient, err := rest.HTTPClientFor(&config)
@@ -59,21 +59,21 @@ func NewForConfig(c *rest.Config) (*KafkaV1beta2Client, error) {
return NewForConfigAndClient(&config, httpClient)
}
-// NewForConfigAndClient creates a new KafkaV1beta2Client for the given config and http client.
+// NewForConfigAndClient creates a new KafkaV1Client 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) {
+func NewForConfigAndClient(c *rest.Config, h *http.Client) (*KafkaV1Client, error) {
config := *c
setConfigDefaults(&config)
client, err := rest.RESTClientForConfigAndClient(&config, h)
if err != nil {
return nil, err
}
- return &KafkaV1beta2Client{client}, nil
+ return &KafkaV1Client{client}, nil
}
-// NewForConfigOrDie creates a new KafkaV1beta2Client for the given config and
+// NewForConfigOrDie creates a new KafkaV1Client for the given config and
// panics if there is an error in the config.
-func NewForConfigOrDie(c *rest.Config) *KafkaV1beta2Client {
+func NewForConfigOrDie(c *rest.Config) *KafkaV1Client {
client, err := NewForConfig(c)
if err != nil {
panic(err)
@@ -81,13 +81,13 @@ func NewForConfigOrDie(c *rest.Config) *KafkaV1beta2Client {
return client
}
-// New creates a new KafkaV1beta2Client for the given RESTClient.
-func New(c rest.Interface) *KafkaV1beta2Client {
- return &KafkaV1beta2Client{c}
+// New creates a new KafkaV1Client for the given RESTClient.
+func New(c rest.Interface) *KafkaV1Client {
+ return &KafkaV1Client{c}
}
func setConfigDefaults(config *rest.Config) {
- gv := strimziv1beta2.SchemeGroupVersion
+ gv := strimziv1.SchemeGroupVersion
config.GroupVersion = &gv
config.APIPath = "/apis"
config.NegotiatedSerializer = rest.CodecFactoryForGeneratedClient(scheme.Scheme, scheme.Codecs).WithoutConversion()
@@ -99,7 +99,7 @@ func setConfigDefaults(config *rest.Config) {
// RESTClient returns a RESTClient that is used to communicate
// with API server by this client implementation.
-func (c *KafkaV1beta2Client) RESTClient() rest.Interface {
+func (c *KafkaV1Client) RESTClient() rest.Interface {
if c == nil {
return nil
}
diff --git a/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/fake/fake_kafkatopic.go b/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/fake/fake_kafkatopic.go
deleted file mode 100644
index de372c80c..000000000
--- a/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2/fake/fake_kafkatopic.go
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by client-gen. DO NOT EDIT.
-
-package fake
-
-import (
- v1beta2 "github.com/apache/camel-k/v2/pkg/apis/duck/strimzi/v1beta2"
- strimziv1beta2 "github.com/apache/camel-k/v2/pkg/client/strimzi/clientset/internalclientset/typed/strimzi/v1beta2"
- gentype "k8s.io/client-go/gentype"
-)
-
-// fakeKafkaTopics implements KafkaTopicInterface
-type fakeKafkaTopics struct {
- *gentype.FakeClientWithList[*v1beta2.KafkaTopic, *v1beta2.KafkaTopicList]
- Fake *FakeKafkaV1beta2
-}
-
-func newFakeKafkaTopics(fake *FakeKafkaV1beta2, namespace string) strimziv1beta2.KafkaTopicInterface {
- return &fakeKafkaTopics{
- gentype.NewFakeClientWithList[*v1beta2.KafkaTopic, *v1beta2.KafkaTopicList](
- fake.Fake,
- namespace,
- v1beta2.SchemeGroupVersion.WithResource("kafkatopics"),
- v1beta2.SchemeGroupVersion.WithKind("KafkaTopic"),
- func() *v1beta2.KafkaTopic { return &v1beta2.KafkaTopic{} },
- func() *v1beta2.KafkaTopicList { return &v1beta2.KafkaTopicList{} },
- func(dst, src *v1beta2.KafkaTopicList) { dst.ListMeta = src.ListMeta },
- func(list *v1beta2.KafkaTopicList) []*v1beta2.KafkaTopic { return gentype.ToPointerSlice(list.Items) },
- func(list *v1beta2.KafkaTopicList, items []*v1beta2.KafkaTopic) {
- list.Items = gentype.FromPointerSlice(items)
- },
- ),
- fake,
- }
-}
diff --git a/pkg/util/bindings/strimzi.go b/pkg/util/bindings/strimzi.go
index 196617eca..bf51296fd 100644
--- a/pkg/util/bindings/strimzi.go
+++ b/pkg/util/bindings/strimzi.go
@@ -22,7 +22,7 @@ import (
"fmt"
camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
- "github.com/apache/camel-k/v2/pkg/apis/duck/strimzi/v1beta2"
+ strimziv1 "github.com/apache/camel-k/v2/pkg/apis/duck/strimzi/v1"
"github.com/apache/camel-k/v2/pkg/client/strimzi/clientset/internalclientset"
"github.com/apache/camel-k/v2/pkg/util/uri"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
@@ -58,7 +58,7 @@ func (s StrimziBindingProvider) Translate(ctx BindingContext, _ EndpointContext,
if err != nil {
return nil, err
}
- if gv.Group != v1beta2.StrimziGroup {
+ if gv.Group != strimziv1.StrimziGroup {
// IMPORTANT: just pass through if this provider cannot manage the binding. Another provider in the chain may take care or it.
return nil, nil
}
@@ -78,13 +78,13 @@ func (s StrimziBindingProvider) Translate(ctx BindingContext, _ EndpointContext,
// toCamelKafka serialize an endpoint to a camelKafka struct.
func (s StrimziBindingProvider) toCamelKafka(ctx BindingContext, endpoint camelv1.Endpoint) (*camelKafka, error) {
switch endpoint.Ref.Kind {
- case v1beta2.StrimziKindKafkaCluster:
+ case strimziv1.StrimziKindKafkaCluster:
return s.fromKafkaToCamel(ctx, endpoint)
- case v1beta2.StrimziKindTopic:
+ case strimziv1.StrimziKindTopic:
return s.fromKafkaTopicToCamel(ctx, endpoint)
}
- return nil, fmt.Errorf("invalid endpoint kind. Can only work with %s or %s kind", v1beta2.StrimziKindKafkaCluster, v1beta2.StrimziKindTopic)
+ return nil, fmt.Errorf("invalid endpoint kind. Can only work with %s or %s kind", strimziv1.StrimziKindKafkaCluster, strimziv1.StrimziKindTopic)
}
// Verify and transform a Kafka resource to Camel Kafka endpoint parameters.
@@ -165,9 +165,9 @@ func (s StrimziBindingProvider) lookupBootstrapServers(ctx BindingContext, endpo
return "", err
}
- clusterName := topic.Labels[v1beta2.StrimziKafkaClusterLabel]
+ clusterName := topic.Labels[strimziv1.StrimziKafkaClusterLabel]
if clusterName == "" {
- return "", fmt.Errorf("no %q label defined on topic %s", v1beta2.StrimziKafkaClusterLabel, endpoint.Ref.Name)
+ return "", fmt.Errorf("no %q label defined on topic %s", strimziv1.StrimziKafkaClusterLabel, endpoint.Ref.Name)
}
namespace := endpoint.Ref.Namespace
if namespace == "" {
@@ -182,31 +182,31 @@ func (s StrimziBindingProvider) lookupBootstrapServers(ctx BindingContext, endpo
}
func (s StrimziBindingProvider) getBootstrapServers(ctx BindingContext, clusterName, namespace string) (string, error) {
- cluster, err := s.Client.KafkaV1beta2().Kafkas(namespace).Get(ctx.Ctx, clusterName, v1.GetOptions{})
+ cluster, err := s.Client.KafkaV1().Kafkas(namespace).Get(ctx.Ctx, clusterName, v1.GetOptions{})
if err != nil {
return "", err
}
for _, l := range cluster.Status.Listeners {
- if l.Name == v1beta2.StrimziListenerNamePlain {
+ if l.Name == strimziv1.StrimziListenerNamePlain {
if l.BootstrapServers == "" {
- return "", fmt.Errorf("cluster %q has no bootstrap servers in %q listener", clusterName, v1beta2.StrimziListenerNamePlain)
+ return "", fmt.Errorf("cluster %q has no bootstrap servers in %q listener", clusterName, strimziv1.StrimziListenerNamePlain)
}
return l.BootstrapServers, nil
}
}
- return "", fmt.Errorf("cluster %q has no listeners of name %q", clusterName, v1beta2.StrimziListenerNamePlain)
+ return "", fmt.Errorf("cluster %q has no listeners of name %q", clusterName, strimziv1.StrimziListenerNamePlain)
}
-func (s StrimziBindingProvider) lookupTopic(ctx BindingContext, endpoint camelv1.Endpoint) (*v1beta2.KafkaTopic, error) {
+func (s StrimziBindingProvider) lookupTopic(ctx BindingContext, endpoint camelv1.Endpoint) (*strimziv1.KafkaTopic, error) {
namespace := endpoint.Ref.Namespace
if namespace == "" {
namespace = ctx.Namespace
}
// first check by KafkaTopic name
- topic, err := s.Client.KafkaV1beta2().KafkaTopics(namespace).Get(ctx.Ctx, endpoint.Ref.Name, v1.GetOptions{})
+ topic, err := s.Client.KafkaV1().KafkaTopics(namespace).Get(ctx.Ctx, endpoint.Ref.Name, v1.GetOptions{})
if err != nil && !k8serrors.IsNotFound(err) {
return nil, err
}
@@ -215,7 +215,7 @@ func (s StrimziBindingProvider) lookupTopic(ctx BindingContext, endpoint camelv1
}
// if not found, then, look at the .status.topicName (it may be autogenerated)
- topics, err := s.Client.KafkaV1beta2().KafkaTopics(namespace).List(ctx.Ctx, v1.ListOptions{
+ topics, err := s.Client.KafkaV1().KafkaTopics(namespace).List(ctx.Ctx, v1.ListOptions{
FieldSelector: "status.topicName=" + endpoint.Ref.Name,
})
diff --git a/pkg/util/bindings/strimzi_test.go b/pkg/util/bindings/strimzi_test.go
index c268aeab7..8a05021c6 100644
--- a/pkg/util/bindings/strimzi_test.go
+++ b/pkg/util/bindings/strimzi_test.go
@@ -22,7 +22,7 @@ import (
"testing"
camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
- "github.com/apache/camel-k/v2/pkg/apis/duck/strimzi/v1beta2"
+ strimziv1 "github.com/apache/camel-k/v2/pkg/apis/duck/strimzi/v1"
"github.com/apache/camel-k/v2/pkg/client/strimzi/clientset/internalclientset/fake"
"github.com/apache/camel-k/v2/pkg/internal"
@@ -70,13 +70,13 @@ func TestStrimziLookup(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
- cluster := v1beta2.Kafka{
+ cluster := strimziv1.Kafka{
ObjectMeta: metav1.ObjectMeta{
Namespace: "test",
Name: "myclusterx",
},
- Status: v1beta2.KafkaStatus{
- Listeners: []v1beta2.KafkaStatusListener{
+ Status: strimziv1.KafkaStatus{
+ Listeners: []strimziv1.KafkaStatusListener{
{
Name: "tls",
},
@@ -88,12 +88,12 @@ func TestStrimziLookup(t *testing.T) {
},
}
- topic := v1beta2.KafkaTopic{
+ topic := strimziv1.KafkaTopic{
ObjectMeta: metav1.ObjectMeta{
Namespace: "test",
Name: "mytopicy",
Labels: map[string]string{
- v1beta2.StrimziKafkaClusterLabel: "myclusterx",
+ strimziv1.StrimziKafkaClusterLabel: "myclusterx",
},
},
}
@@ -130,13 +130,13 @@ func TestStrimziLookupByTopicName(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
- cluster := v1beta2.Kafka{
+ cluster := strimziv1.Kafka{
ObjectMeta: metav1.ObjectMeta{
Namespace: "test",
Name: "myclusterx",
},
- Status: v1beta2.KafkaStatus{
- Listeners: []v1beta2.KafkaStatusListener{
+ Status: strimziv1.KafkaStatus{
+ Listeners: []strimziv1.KafkaStatusListener{
{
Name: "tls",
},
@@ -148,15 +148,15 @@ func TestStrimziLookupByTopicName(t *testing.T) {
},
}
- topic := v1beta2.KafkaTopic{
+ topic := strimziv1.KafkaTopic{
ObjectMeta: metav1.ObjectMeta{
Namespace: "test",
Name: "mytopicy",
Labels: map[string]string{
- v1beta2.StrimziKafkaClusterLabel: "myclusterx",
+ strimziv1.StrimziKafkaClusterLabel: "myclusterx",
},
},
- Status: v1beta2.KafkaTopicStatus{
+ Status: strimziv1.KafkaTopicStatus{
TopicName: "my-topic-name",
},
}
@@ -193,13 +193,13 @@ func TestStrimziKafkaCR(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
- cluster := v1beta2.Kafka{
+ cluster := strimziv1.Kafka{
ObjectMeta: metav1.ObjectMeta{
Namespace: "test",
Name: "my-kafka",
},
- Status: v1beta2.KafkaStatus{
- Listeners: []v1beta2.KafkaStatusListener{
+ Status: strimziv1.KafkaStatus{
+ Listeners: []strimziv1.KafkaStatusListener{
{
Name: "tls",
},
@@ -246,13 +246,13 @@ func TestStrimziPassThrough(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
- cluster := v1beta2.Kafka{
+ cluster := strimziv1.Kafka{
ObjectMeta: metav1.ObjectMeta{
Namespace: "test",
Name: "my-kafka",
},
- Status: v1beta2.KafkaStatus{
- Listeners: []v1beta2.KafkaStatusListener{
+ Status: strimziv1.KafkaStatus{
+ Listeners: []strimziv1.KafkaStatusListener{
{
Name: "tls",
},
diff --git a/script/gen_client.sh b/script/gen_client.sh
index 39827650b..14c4f40bd 100755
--- a/script/gen_client.sh
+++ b/script/gen_client.sh
@@ -44,7 +44,7 @@ $(go env GOPATH)/bin/client-gen \
--output-pkg=github.com/apache/camel-k/v2/pkg/client/camel/clientset
$(go env GOPATH)/bin/client-gen \
- --input strimzi/v1beta2 \
+ --input strimzi/v1 \
--go-header-file=../../script/headers/default.txt \
--input-base=github.com/apache/camel-k/v2/pkg/apis/duck \
--output-dir=./strimzi/clientset/ \