Skip to content

Commit

Permalink
Use and test KafkaSource v1 API
Browse files Browse the repository at this point in the history 
Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
  • Loading branch information
@pierDipi
pierDipi committed Oct 15, 2024
1 parent 024dd1f commit 09908e5
Show file tree
Hide file tree
Showing 45 changed files with 117 additions and 162 deletions.
3 changes: 2 additions & 1 deletion control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_defaults.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ package v1alpha1
import (
"context"

sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
"knative.dev/pkg/apis"

sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"
)

var (
Expand Down
3 changes: 2 additions & 1 deletion control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_defaults_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"

sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"
)

func TestConsumerSetDefaults(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletion control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_group_defaults_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ import (
"github.com/google/go-cmp/cmp"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"

sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"
)

func TestConsumerGroupSetDefaults(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_group_validation_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"knative.dev/pkg/apis"
duckv1 "knative.dev/pkg/apis/duck/v1"

kafkasource "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
kafkasource "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"knative.dev/pkg/apis"
duckv1 "knative.dev/pkg/apis/duck/v1"

bindings "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
bindings "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"

eventingv1alpha1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/eventing/v1alpha1"
)
Expand Down
7 changes: 4 additions & 3 deletions control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_validation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ import (
"context"
"fmt"

"knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
"knative.dev/pkg/apis"

sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"
)

func (c *Consumer) Validate(ctx context.Context) *apis.FieldError {
Expand Down Expand Up @@ -72,14 +73,14 @@ func (cc *ConsumerConfigs) Validate(ctx context.Context) *apis.FieldError {

if cc.KeyType != nil {
found := false
for _, allowed := range v1beta1.KafkaKeyTypeAllowed {
for _, allowed := range sources.KafkaKeyTypeAllowed {
if allowed == *cc.KeyType {
found = true
break
}
}
if !found {
return apis.ErrInvalidValue(*cc.KeyType, "keyType", fmt.Sprintf("allowed values: %v", v1beta1.KafkaKeyTypeAllowed))
return apis.ErrInvalidValue(*cc.KeyType, "keyType", fmt.Sprintf("allowed values: %v", sources.KafkaKeyTypeAllowed))
}
}

Expand Down
3 changes: 2 additions & 1 deletion control-plane/pkg/apis/sources/v1beta1/kafka_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
bindingsv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1"
eventingduckv1 "knative.dev/eventing/pkg/apis/duck/v1"
"knative.dev/pkg/apis"
duckv1 "knative.dev/pkg/apis/duck/v1"
"knative.dev/pkg/kmeta"
"knative.dev/pkg/webhook/resourcesemantics"

bindingsv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1"
)

// +genclient
Expand Down
4 changes: 2 additions & 2 deletions control-plane/pkg/autoscaler/keda/keda.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"knative.dev/pkg/kmeta"
"knative.dev/pkg/logging"

"knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1"
bindings "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1"
"knative.dev/eventing-kafka-broker/control-plane/pkg/apis/config"
"knative.dev/eventing-kafka-broker/third_party/pkg/client/clientset/versioned"

Expand Down Expand Up @@ -222,7 +222,7 @@ func retrieveSaslTypeIfPresent(cg *kafkainternals.ConsumerGroup, secret corev1.S
return nil
}

func addAuthSecretTargetRef(parameter string, secretKeyRef v1beta1.SecretValueFromSource, secretTargetRefs []kedav1alpha1.AuthSecretTargetRef) []kedav1alpha1.AuthSecretTargetRef {
func addAuthSecretTargetRef(parameter string, secretKeyRef bindings.SecretValueFromSource, secretTargetRefs []kedav1alpha1.AuthSecretTargetRef) []kedav1alpha1.AuthSecretTargetRef {
if secretKeyRef.SecretKeyRef == nil || secretKeyRef.SecretKeyRef.Name == "" || secretKeyRef.SecretKeyRef.Key == "" {
return secretTargetRefs
}
Expand Down
2 changes: 1 addition & 1 deletion control-plane/pkg/reconciler/base/receiver_condition_set.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
duckv1 "knative.dev/pkg/apis/duck/v1"
"knative.dev/pkg/reconciler"

sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"

"knative.dev/eventing-kafka-broker/control-plane/pkg/config"
"knative.dev/eventing-kafka-broker/control-plane/pkg/prober"
Expand Down
2 changes: 1 addition & 1 deletion control-plane/pkg/reconciler/broker/namespaced_broker_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/utils/pointer"

sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"

"knative.dev/eventing-kafka-broker/control-plane/pkg/config"
"knative.dev/eventing-kafka-broker/control-plane/pkg/contract"
Expand Down
2 changes: 1 addition & 1 deletion control-plane/pkg/reconciler/channel/channel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ import (

messagingv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/messaging/v1beta1"

kafkasource "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
kafkasource "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"
kedafunc "knative.dev/eventing-kafka-broker/control-plane/pkg/autoscaler/keda"
"knative.dev/eventing-kafka-broker/control-plane/pkg/config"
"knative.dev/eventing-kafka-broker/control-plane/pkg/contract"
Expand Down
2 changes: 1 addition & 1 deletion control-plane/pkg/reconciler/channel/channel_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import (
"knative.dev/pkg/system"

apisconfig "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/config"
kafkasource "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
kafkasource "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"
"knative.dev/eventing-kafka-broker/control-plane/pkg/config"
"knative.dev/eventing-kafka-broker/control-plane/pkg/contract"
"knative.dev/eventing-kafka-broker/control-plane/pkg/kafka"
Expand Down
2 changes: 1 addition & 1 deletion control-plane/pkg/reconciler/consumer/consumer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import (
"knative.dev/eventing-kafka-broker/control-plane/pkg/apis/config"
internalsapi "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/internalskafkaeventing"
kafkainternals "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/internalskafkaeventing/v1alpha1"
kafkasource "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
kafkasource "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"
"knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/reconciler/internalskafkaeventing/v1alpha1/consumer"
kafkainternalslisters "knative.dev/eventing-kafka-broker/control-plane/pkg/client/listers/internalskafkaeventing/v1alpha1"
"knative.dev/eventing-kafka-broker/control-plane/pkg/contract"
Expand Down
2 changes: 1 addition & 1 deletion control-plane/pkg/reconciler/consumer/consumer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (

configapis "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/config"
kafkainternals "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/internalskafkaeventing/v1alpha1"
kafkasource "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
kafkasource "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"
fakekafkainternalsclient "knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/client/fake"
creconciler "knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/reconciler/internalskafkaeventing/v1alpha1/consumer"
"knative.dev/eventing-kafka-broker/control-plane/pkg/config"
Expand Down
2 changes: 1 addition & 1 deletion control-plane/pkg/reconciler/consumergroup/consumergroup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import (
"knative.dev/pkg/reconciler"
"knative.dev/pkg/resolver"

sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"
"knative.dev/eventing-kafka-broker/control-plane/pkg/kafka/clientpool"
"knative.dev/eventing-kafka-broker/control-plane/pkg/prober"

Expand Down
6 changes: 3 additions & 3 deletions control-plane/pkg/reconciler/consumergroup/consumergroup_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (
"knative.dev/pkg/apis"
kubeclient "knative.dev/pkg/client/injection/kube/client/fake"

bindings "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
bindings "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"
"knative.dev/eventing-kafka-broker/control-plane/pkg/prober"

"knative.dev/pkg/controller"
Expand All @@ -45,7 +45,7 @@ import (
"knative.dev/eventing/pkg/scheduler"

kafkainternals "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/internalskafkaeventing/v1alpha1"
kafkasource "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
kafkasource "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"
fakekafkainternalsclient "knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/client/fake"
"knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/reconciler/internalskafkaeventing/v1alpha1/consumergroup"
"knative.dev/eventing-kafka-broker/control-plane/pkg/counter"
Expand Down
2 changes: 1 addition & 1 deletion control-plane/pkg/reconciler/consumergroup/controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
reconcilertesting "knative.dev/pkg/reconciler/testing"

internalsapi "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/internalskafkaeventing"
_ "knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/informers/sources/v1beta1/kafkasource/fake"
_ "knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/informers/sources/v1/kafkasource/fake"
"knative.dev/eventing-kafka-broker/control-plane/pkg/kafka/clientpool"

kafkainternals "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/internalskafkaeventing/v1alpha1"
Expand Down
6 changes: 3 additions & 3 deletions control-plane/pkg/reconciler/source/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ import (
consumergroupclient "knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/client"
consumergroupinformer "knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/informers/internalskafkaeventing/v1alpha1/consumergroup"

sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"

kafkainformer "knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/informers/sources/v1beta1/kafkasource"
"knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/reconciler/sources/v1beta1/kafkasource"
kafkainformer "knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/informers/sources/v1/kafkasource"
"knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/reconciler/sources/v1/kafkasource"

"knative.dev/eventing-kafka-broker/control-plane/pkg/reconciler/consumergroup"
kedaclient "knative.dev/eventing-kafka-broker/third_party/pkg/client/injection/client"
Expand Down
2 changes: 1 addition & 1 deletion control-plane/pkg/reconciler/source/controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
dynamicclient "knative.dev/pkg/injection/clients/dynamicclient/fake"
reconcilertesting "knative.dev/pkg/reconciler/testing"

_ "knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/informers/sources/v1beta1/kafkasource/fake"
_ "knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/informers/sources/v1/kafkasource/fake"

_ "knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/informers/internalskafkaeventing/v1alpha1/consumergroup/fake"

Expand Down
2 changes: 1 addition & 1 deletion control-plane/pkg/reconciler/source/source.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
"knative.dev/pkg/reconciler"

"knative.dev/eventing-kafka-broker/control-plane/pkg/apis/config"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"

internalscg "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/internalskafkaeventing/v1alpha1"
"knative.dev/eventing-kafka-broker/control-plane/pkg/autoscaler/keda"
Expand Down
15 changes: 7 additions & 8 deletions control-plane/pkg/reconciler/source/source_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ import (
cm "knative.dev/pkg/configmap/testing"
"knative.dev/pkg/kmeta"

"knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1"
bindings "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1"
bindings "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1"
configapis "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/config"

kafkainternals "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/internalskafkaeventing/v1alpha1"
Expand All @@ -46,9 +45,9 @@ import (
"knative.dev/pkg/logging"
. "knative.dev/pkg/reconciler/testing"

sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"
fakeeventingkafkaclient "knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/client/fake"
eventingkafkasourcereconciler "knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/reconciler/sources/v1beta1/kafkasource"
eventingkafkasourcereconciler "knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/reconciler/sources/v1/kafkasource"

fakeconsumergroupinformer "knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/client/fake"

Expand Down Expand Up @@ -401,9 +400,9 @@ func TestReconcileKind(t *testing.T) {
UID: SourceUUID,
},
Spec: sources.KafkaSourceSpec{
KafkaAuthSpec: v1beta1.KafkaAuthSpec{
KafkaAuthSpec: bindings.KafkaAuthSpec{
BootstrapServers: []string{SourceBootstrapServers},
Net: v1beta1.KafkaNetSpec{
Net: bindings.KafkaNetSpec{
SASL: bindings.KafkaSASLSpec{
Enable: true,
User: bindings.SecretValueFromSource{
Expand Down Expand Up @@ -538,9 +537,9 @@ func TestReconcileKind(t *testing.T) {
UID: SourceUUID,
},
Spec: sources.KafkaSourceSpec{
KafkaAuthSpec: v1beta1.KafkaAuthSpec{
KafkaAuthSpec: bindings.KafkaAuthSpec{
BootstrapServers: []string{SourceBootstrapServers},
Net: v1beta1.KafkaNetSpec{
Net: bindings.KafkaNetSpec{
SASL: bindings.KafkaSASLSpec{
Enable: true,
User: bindings.SecretValueFromSource{
Expand Down
4 changes: 2 additions & 2 deletions control-plane/pkg/reconciler/testing/listers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ import (
"knative.dev/pkg/reconciler/testing"

eventingkafkachannels "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/messaging/v1beta1"
eventingkafkasources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
eventingkafkasources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"
eventingkafkachannelslisters "knative.dev/eventing-kafka-broker/control-plane/pkg/client/listers/messaging/v1beta1"
eventingkafkasourceslisters "knative.dev/eventing-kafka-broker/control-plane/pkg/client/listers/sources/v1beta1"
eventingkafkasourceslisters "knative.dev/eventing-kafka-broker/control-plane/pkg/client/listers/sources/v1"

eventingkafkabrokerconsumer "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/internalskafkaeventing/v1alpha1"

Check failure on line 44 in control-plane/pkg/reconciler/testing/listers.go

View workflow job for this annotation

GitHub Actions / style / Golang / Lint 

could not import knative.dev/eventing-kafka-broker/control-plane/pkg/apis/internalskafkaeventing/v1alpha1 (-: # knative.dev/eventing-kafka-broker/control-plane/pkg/apis/internalskafkaeventing/v1alpha1

Expand Down
2 changes: 1 addition & 1 deletion control-plane/pkg/reconciler/testing/objects_common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"k8s.io/apimachinery/pkg/types"
eventing "knative.dev/eventing/pkg/apis/eventing/v1"

sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"

"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/proto"
Expand Down
6 changes: 3 additions & 3 deletions control-plane/pkg/reconciler/testing/objects_consumer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"knative.dev/pkg/apis"
duckv1 "knative.dev/pkg/apis/duck/v1"

"knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
bindings "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"

kafkainternals "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/internalskafkaeventing/v1alpha1"
)
Expand Down Expand Up @@ -178,7 +178,7 @@ func NewConsumerTimeout(timeout string) DeliverySpecOption {

func NewConsumerSpecAuth() *kafkainternals.Auth {
return &kafkainternals.Auth{
NetSpec: &v1beta1.KafkaNetSpec{},
NetSpec: &bindings.KafkaNetSpec{},
}
}

Expand Down
8 changes: 4 additions & 4 deletions control-plane/pkg/reconciler/testing/objects_source.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"knative.dev/pkg/apis"
duckv1 "knative.dev/pkg/apis/duck/v1"

"knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
bindings "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"

"knative.dev/eventing-kafka-broker/control-plane/pkg/contract"
"knative.dev/eventing-kafka-broker/control-plane/pkg/reconciler/base"
Expand Down Expand Up @@ -60,9 +60,9 @@ func NewSource(options ...KRShapedOption) *sources.KafkaSource {
UID: SourceUUID,
},
Spec: sources.KafkaSourceSpec{
KafkaAuthSpec: v1beta1.KafkaAuthSpec{
KafkaAuthSpec: bindings.KafkaAuthSpec{
BootstrapServers: []string{SourceBootstrapServers},
Net: v1beta1.KafkaNetSpec{},
Net: bindings.KafkaNetSpec{},
},
Topics: SourceTopics,
ConsumerGroup: SourceConsumerGroup,
Expand Down
3 changes: 2 additions & 1 deletion control-plane/pkg/reconciler/trigger/namespaced_trigger_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
clientgotesting "k8s.io/client-go/testing"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
kubeclient "knative.dev/pkg/client/injection/kube/client/fake"
"knative.dev/pkg/controller"
"knative.dev/pkg/logging"
. "knative.dev/pkg/reconciler/testing"
"knative.dev/pkg/resolver"
"knative.dev/pkg/tracker"

sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"

eventing "knative.dev/eventing/pkg/apis/eventing/v1"
eventingclient "knative.dev/eventing/pkg/client/injection/client/fake"
triggerreconciler "knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/trigger"
Expand Down
2 changes: 1 addition & 1 deletion control-plane/pkg/reconciler/trigger/trigger.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import (
duckv1 "knative.dev/pkg/apis/duck/v1"

apisconfig "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/config"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"
"knative.dev/eventing-kafka-broker/control-plane/pkg/config"
"knative.dev/eventing-kafka-broker/control-plane/pkg/contract"
coreconfig "knative.dev/eventing-kafka-broker/control-plane/pkg/core/config"
Expand Down
2 changes: 1 addition & 1 deletion control-plane/pkg/reconciler/trigger/trigger_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import (
"knative.dev/pkg/tracker"

apisconfig "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/config"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"

eventingduck "knative.dev/eventing/pkg/apis/duck/v1"
eventing "knative.dev/eventing/pkg/apis/eventing/v1"
Expand Down
2 changes: 1 addition & 1 deletion control-plane/pkg/reconciler/trigger/v2/triggerv2.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import (
"knative.dev/pkg/reconciler"

apisconfig "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/config"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"

internalscg "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/internalskafkaeventing/v1alpha1"
kedafunc "knative.dev/eventing-kafka-broker/control-plane/pkg/autoscaler/keda"
Expand Down
2 changes: 1 addition & 1 deletion control-plane/pkg/reconciler/trigger/v2/triggerv2_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"k8s.io/utils/pointer"
eventingduck "knative.dev/eventing/pkg/apis/duck/v1"

sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"
"knative.dev/eventing-kafka-broker/control-plane/pkg/kafka"

internalscg "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/internalskafkaeventing/v1alpha1"
Expand Down
Loading

0 comments on commit 09908e5

Please sign in to comment.