diff --git a/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_defaults.go b/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_defaults.go index de0cf8af77..64b9316c78 100644 --- a/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_defaults.go +++ b/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_defaults.go @@ -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 ( diff --git a/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_defaults_test.go b/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_defaults_test.go index 42f4e0b185..bfdb562ffa 100644 --- a/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_defaults_test.go +++ b/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_defaults_test.go @@ -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) { diff --git a/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_group_defaults_test.go b/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_group_defaults_test.go index 878e8ce631..3fc06fbeb0 100644 --- a/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_group_defaults_test.go +++ b/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_group_defaults_test.go @@ -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) { diff --git a/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_group_validation_test.go b/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_group_validation_test.go index 24038ff54e..d5ea49152e 100644 --- a/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_group_validation_test.go +++ b/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_group_validation_test.go @@ -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 ( diff --git a/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_types.go b/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_types.go index 1861099c23..a5177e376a 100644 --- a/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_types.go +++ b/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_types.go @@ -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" ) diff --git a/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_validation.go b/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_validation.go index d1e661c4b4..345c511b54 100644 --- a/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_validation.go +++ b/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/consumer_validation.go @@ -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 { @@ -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)) } } diff --git a/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/zz_generated.deepcopy.go b/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/zz_generated.deepcopy.go index 85574c8251..f255cf46af 100644 --- a/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/zz_generated.deepcopy.go +++ b/control-plane/pkg/apis/internalskafkaeventing/v1alpha1/zz_generated.deepcopy.go @@ -22,9 +22,9 @@ package v1alpha1 import ( - v1 "k8s.io/api/core/v1" + corev1 "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" - v1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1" + v1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1" eventingv1alpha1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/eventing/v1alpha1" apisduckv1 "knative.dev/eventing/pkg/apis/duck/v1" eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1" @@ -37,7 +37,7 @@ func (in *Auth) DeepCopyInto(out *Auth) { *out = *in if in.NetSpec != nil { in, out := &in.NetSpec, &out.NetSpec - *out = new(v1beta1.KafkaNetSpec) + *out = new(v1.KafkaNetSpec) (*in).DeepCopyInto(*out) } if in.AuthSpec != nil { @@ -229,7 +229,7 @@ func (in *ConsumerGroupSpec) DeepCopyInto(out *ConsumerGroupSpec) { } if in.TopLevelResourceRef != nil { in, out := &in.TopLevelResourceRef, &out.TopLevelResourceRef - *out = new(v1.ObjectReference) + *out = new(corev1.ObjectReference) **out = **in } return diff --git a/control-plane/pkg/apis/sources/v1beta1/kafka_types.go b/control-plane/pkg/apis/sources/v1beta1/kafka_types.go index 3ebcc459ae..fc347d31f2 100644 --- a/control-plane/pkg/apis/sources/v1beta1/kafka_types.go +++ b/control-plane/pkg/apis/sources/v1beta1/kafka_types.go @@ -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 diff --git a/control-plane/pkg/autoscaler/keda/keda.go b/control-plane/pkg/autoscaler/keda/keda.go index 7b9757736d..8a14ae0292 100644 --- a/control-plane/pkg/autoscaler/keda/keda.go +++ b/control-plane/pkg/autoscaler/keda/keda.go @@ -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" @@ -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 } diff --git a/control-plane/pkg/reconciler/base/receiver_condition_set.go b/control-plane/pkg/reconciler/base/receiver_condition_set.go index 4af83bd1d1..4091d27f31 100644 --- a/control-plane/pkg/reconciler/base/receiver_condition_set.go +++ b/control-plane/pkg/reconciler/base/receiver_condition_set.go @@ -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" diff --git a/control-plane/pkg/reconciler/broker/namespaced_broker_test.go b/control-plane/pkg/reconciler/broker/namespaced_broker_test.go index ad1cc59827..563e9474d1 100644 --- a/control-plane/pkg/reconciler/broker/namespaced_broker_test.go +++ b/control-plane/pkg/reconciler/broker/namespaced_broker_test.go @@ -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" diff --git a/control-plane/pkg/reconciler/channel/channel.go b/control-plane/pkg/reconciler/channel/channel.go index 4e83020367..9e993610a8 100644 --- a/control-plane/pkg/reconciler/channel/channel.go +++ b/control-plane/pkg/reconciler/channel/channel.go @@ -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" diff --git a/control-plane/pkg/reconciler/channel/channel_test.go b/control-plane/pkg/reconciler/channel/channel_test.go index 5ec78fd5b9..da7ae1dd7b 100644 --- a/control-plane/pkg/reconciler/channel/channel_test.go +++ b/control-plane/pkg/reconciler/channel/channel_test.go @@ -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" diff --git a/control-plane/pkg/reconciler/consumer/consumer.go b/control-plane/pkg/reconciler/consumer/consumer.go index 42f09a3a32..bb3206dbab 100644 --- a/control-plane/pkg/reconciler/consumer/consumer.go +++ b/control-plane/pkg/reconciler/consumer/consumer.go @@ -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" diff --git a/control-plane/pkg/reconciler/consumer/consumer_test.go b/control-plane/pkg/reconciler/consumer/consumer_test.go index 68c7b2769e..abf910b0e9 100644 --- a/control-plane/pkg/reconciler/consumer/consumer_test.go +++ b/control-plane/pkg/reconciler/consumer/consumer_test.go @@ -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" diff --git a/control-plane/pkg/reconciler/consumergroup/consumergroup.go b/control-plane/pkg/reconciler/consumergroup/consumergroup.go index 19baf9672d..642161eb54 100644 --- a/control-plane/pkg/reconciler/consumergroup/consumergroup.go +++ b/control-plane/pkg/reconciler/consumergroup/consumergroup.go @@ -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" diff --git a/control-plane/pkg/reconciler/consumergroup/consumergroup_test.go b/control-plane/pkg/reconciler/consumergroup/consumergroup_test.go index 49e959c2ae..9278b4fa38 100644 --- a/control-plane/pkg/reconciler/consumergroup/consumergroup_test.go +++ b/control-plane/pkg/reconciler/consumergroup/consumergroup_test.go @@ -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" @@ -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" diff --git a/control-plane/pkg/reconciler/consumergroup/controller_test.go b/control-plane/pkg/reconciler/consumergroup/controller_test.go index 23ae76ff26..37c7d7e456 100644 --- a/control-plane/pkg/reconciler/consumergroup/controller_test.go +++ b/control-plane/pkg/reconciler/consumergroup/controller_test.go @@ -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" diff --git a/control-plane/pkg/reconciler/source/controller.go b/control-plane/pkg/reconciler/source/controller.go index 412fbef76a..2d277ef7c1 100644 --- a/control-plane/pkg/reconciler/source/controller.go +++ b/control-plane/pkg/reconciler/source/controller.go @@ -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" diff --git a/control-plane/pkg/reconciler/source/controller_test.go b/control-plane/pkg/reconciler/source/controller_test.go index 4b46245d24..41e83a935f 100644 --- a/control-plane/pkg/reconciler/source/controller_test.go +++ b/control-plane/pkg/reconciler/source/controller_test.go @@ -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" diff --git a/control-plane/pkg/reconciler/source/source.go b/control-plane/pkg/reconciler/source/source.go index 7608c9e6e4..7cafb06e16 100644 --- a/control-plane/pkg/reconciler/source/source.go +++ b/control-plane/pkg/reconciler/source/source.go @@ -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" diff --git a/control-plane/pkg/reconciler/source/source_test.go b/control-plane/pkg/reconciler/source/source_test.go index d0ced1ba96..bef97a0dad 100644 --- a/control-plane/pkg/reconciler/source/source_test.go +++ b/control-plane/pkg/reconciler/source/source_test.go @@ -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" @@ -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" @@ -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{ @@ -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{ diff --git a/control-plane/pkg/reconciler/testing/listers.go b/control-plane/pkg/reconciler/testing/listers.go index 0480e227b1..56b8b564e1 100644 --- a/control-plane/pkg/reconciler/testing/listers.go +++ b/control-plane/pkg/reconciler/testing/listers.go @@ -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" diff --git a/control-plane/pkg/reconciler/testing/objects_common.go b/control-plane/pkg/reconciler/testing/objects_common.go index 7fa9612fdb..c355f9988b 100644 --- a/control-plane/pkg/reconciler/testing/objects_common.go +++ b/control-plane/pkg/reconciler/testing/objects_common.go @@ -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" diff --git a/control-plane/pkg/reconciler/testing/objects_consumer.go b/control-plane/pkg/reconciler/testing/objects_consumer.go index 820123ea74..c0775d532d 100644 --- a/control-plane/pkg/reconciler/testing/objects_consumer.go +++ b/control-plane/pkg/reconciler/testing/objects_consumer.go @@ -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" ) @@ -178,7 +178,7 @@ func NewConsumerTimeout(timeout string) DeliverySpecOption { func NewConsumerSpecAuth() *kafkainternals.Auth { return &kafkainternals.Auth{ - NetSpec: &v1beta1.KafkaNetSpec{}, + NetSpec: &bindings.KafkaNetSpec{}, } } diff --git a/control-plane/pkg/reconciler/testing/objects_source.go b/control-plane/pkg/reconciler/testing/objects_source.go index 58b3bb8c8d..0705a45d86 100644 --- a/control-plane/pkg/reconciler/testing/objects_source.go +++ b/control-plane/pkg/reconciler/testing/objects_source.go @@ -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" @@ -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, diff --git a/control-plane/pkg/reconciler/trigger/namespaced_trigger_test.go b/control-plane/pkg/reconciler/trigger/namespaced_trigger_test.go index ac3777a619..27a235f0c7 100644 --- a/control-plane/pkg/reconciler/trigger/namespaced_trigger_test.go +++ b/control-plane/pkg/reconciler/trigger/namespaced_trigger_test.go @@ -26,7 +26,6 @@ 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" @@ -34,6 +33,8 @@ import ( "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" diff --git a/control-plane/pkg/reconciler/trigger/trigger.go b/control-plane/pkg/reconciler/trigger/trigger.go index e0b437d957..c63ea0ebbf 100644 --- a/control-plane/pkg/reconciler/trigger/trigger.go +++ b/control-plane/pkg/reconciler/trigger/trigger.go @@ -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" diff --git a/control-plane/pkg/reconciler/trigger/trigger_test.go b/control-plane/pkg/reconciler/trigger/trigger_test.go index fb60254e6f..8b32951f20 100644 --- a/control-plane/pkg/reconciler/trigger/trigger_test.go +++ b/control-plane/pkg/reconciler/trigger/trigger_test.go @@ -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" diff --git a/control-plane/pkg/reconciler/trigger/v2/triggerv2.go b/control-plane/pkg/reconciler/trigger/v2/triggerv2.go index 8bdc0af7f4..08f4931d2b 100644 --- a/control-plane/pkg/reconciler/trigger/v2/triggerv2.go +++ b/control-plane/pkg/reconciler/trigger/v2/triggerv2.go @@ -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" diff --git a/control-plane/pkg/reconciler/trigger/v2/triggerv2_test.go b/control-plane/pkg/reconciler/trigger/v2/triggerv2_test.go index 62ed966870..ec3c442adc 100644 --- a/control-plane/pkg/reconciler/trigger/v2/triggerv2_test.go +++ b/control-plane/pkg/reconciler/trigger/v2/triggerv2_test.go @@ -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" diff --git a/control-plane/pkg/security/secrets_provider_net_spec.go b/control-plane/pkg/security/secrets_provider_net_spec.go index 3d2c845c1e..927a743f63 100644 --- a/control-plane/pkg/security/secrets_provider_net_spec.go +++ b/control-plane/pkg/security/secrets_provider_net_spec.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" corelisters "k8s.io/client-go/listers/core/v1" - bindings "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/contract" ) diff --git a/control-plane/pkg/security/secrets_provider_net_spec_test.go b/control-plane/pkg/security/secrets_provider_net_spec_test.go index 08e3688279..0815f4805f 100644 --- a/control-plane/pkg/security/secrets_provider_net_spec_test.go +++ b/control-plane/pkg/security/secrets_provider_net_spec_test.go @@ -25,10 +25,11 @@ import ( "google.golang.org/protobuf/testing/protocmp" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - bindings "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1" secretinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/secret/fake" reconcilertesting "knative.dev/pkg/reconciler/testing" + bindings "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1" + "knative.dev/eventing-kafka-broker/control-plane/pkg/contract" ) diff --git a/control-plane/pkg/security/secrets_tracker.go b/control-plane/pkg/security/secrets_tracker.go index e9c592a661..f6ee4b23ee 100644 --- a/control-plane/pkg/security/secrets_tracker.go +++ b/control-plane/pkg/security/secrets_tracker.go @@ -18,8 +18,9 @@ package security import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - bindings "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1" "knative.dev/pkg/tracker" + + bindings "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1" ) // TrackNetSpecSecrets tracks all secrets referenced by a provided bindings.KafkaNetSpec. diff --git a/control-plane/pkg/security/secrets_tracker_test.go b/control-plane/pkg/security/secrets_tracker_test.go index b865034fd8..47517c7917 100644 --- a/control-plane/pkg/security/secrets_tracker_test.go +++ b/control-plane/pkg/security/secrets_tracker_test.go @@ -23,9 +23,10 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - bindings "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1" - sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1" "knative.dev/pkg/tracker" + + bindings "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1" + sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1" ) func TestTrackNetSpecSecrets(t *testing.T) { diff --git a/test/config/sacura-sink-source/resources/100-source.yaml b/test/config/sacura-sink-source/resources/100-source.yaml index cbfdfedf0a..38932ac6a9 100644 --- a/test/config/sacura-sink-source/resources/100-source.yaml +++ b/test/config/sacura-sink-source/resources/100-source.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: sources.knative.dev/v1beta1 +apiVersion: sources.knative.dev/v1 kind: KafkaSource metadata: name: source diff --git a/test/e2e/sacura_test.go b/test/e2e/sacura_test.go index 691fa42d40..ea7d536630 100644 --- a/test/e2e/sacura_test.go +++ b/test/e2e/sacura_test.go @@ -36,12 +36,13 @@ import ( "k8s.io/apiserver/pkg/storage/names" "k8s.io/client-go/dynamic" "k8s.io/utils/pointer" - sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1" - "knative.dev/eventing-kafka-broker/control-plane/pkg/kafka" messaging "knative.dev/eventing/pkg/apis/messaging/v1" eventingclientset "knative.dev/eventing/pkg/client/clientset/versioned" testlib "knative.dev/eventing/test/lib" + sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1" + "knative.dev/eventing-kafka-broker/control-plane/pkg/kafka" + pkgtest "knative.dev/eventing-kafka-broker/test/pkg" kafkatest "knative.dev/eventing-kafka-broker/test/pkg/kafka" pkgtesting "knative.dev/eventing-kafka-broker/test/pkg/testing" diff --git a/test/e2e_source/helpers/kafka_source.go b/test/e2e_source/helpers/kafka_source.go index 6409690651..a825055390 100644 --- a/test/e2e_source/helpers/kafka_source.go +++ b/test/e2e_source/helpers/kafka_source.go @@ -28,7 +28,7 @@ import ( "knative.dev/eventing/test/lib/recordevents" "knative.dev/eventing/test/lib/resources" - sourcesv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1" + sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1" contribtestlib "knative.dev/eventing-kafka-broker/test/lib" contribresources "knative.dev/eventing-kafka-broker/test/lib/resources" ) @@ -112,7 +112,7 @@ func AssureKafkaSourceConsumesMsgNoEvent(t *testing.T) { for name, test := range tests { test := test name := name - for _, version := range []string{"v1beta1"} { + for _, version := range []string{"v1"} { testName := name + "-" + version t.Run(testName, func(t *testing.T) { testKafkaSource(t, name, version, test.messageKey, test.messageHeaders, test.messagePayload, test.matcherGen, KafkaBootstrapUrlPlain, test.extensions) @@ -151,18 +151,18 @@ func testKafkaSource(t *testing.T, t.Logf("Creating KafkaSource %s", version) switch version { - case "v1beta1": - contribtestlib.CreateKafkaSourceV1Beta1OrFail(client, contribresources.KafkaSourceV1Beta1( + case "v1": + contribtestlib.CreateKafkaSourceOrFail(client, contribresources.KafkaSource( bootStrapServer, kafkaTopicName, - sourcesv1beta1.Ordered, + sources.Ordered, resources.ServiceRef(recordEventPodName), - contribresources.WithNameV1Beta1(kafkaSourceName), - contribresources.WithConsumerGroupV1Beta1(consumerGroup), - contribresources.WithExtensionsV1Beta1(extensions), + contribresources.WithName(kafkaSourceName), + contribresources.WithConsumerGroup(consumerGroup), + contribresources.WithExtensions(extensions), )) - cloudEventsSourceName = sourcesv1beta1.KafkaEventSource(client.Namespace, kafkaSourceName, kafkaTopicName) - cloudEventsEventType = sourcesv1beta1.KafkaEventType + cloudEventsSourceName = sources.KafkaEventSource(client.Namespace, kafkaSourceName, kafkaTopicName) + cloudEventsEventType = sources.KafkaEventType default: t.Fatalf("Unknown KafkaSource version %s", version) } diff --git a/test/lib/creation.go b/test/lib/creation.go index e7e69091a2..f9b7835f19 100644 --- a/test/lib/creation.go +++ b/test/lib/creation.go @@ -24,9 +24,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/retry" - bindingsv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1" channelsv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/messaging/v1beta1" - sourcesv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1" + sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1" kafkaclientset "knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned" ) @@ -66,14 +65,14 @@ func GetKafkaChannelV1Beta1OrFail(c *testlib.Client, kafkaChannel string) *chann return kcObj } -func CreateKafkaSourceV1Beta1OrFail(c *testlib.Client, kafkaSource *sourcesv1beta1.KafkaSource) { +func CreateKafkaSourceOrFail(c *testlib.Client, kafkaSource *sources.KafkaSource) { client, err := kafkaclientset.NewForConfig(c.Config) if err != nil { - c.T.Fatalf("Failed to create v1beta1 KafkaSource client: %v", err) + c.T.Fatalf("Failed to create KafkaSource client: %v", err) } err = c.RetryWebhookErrors(func(i int) error { - createdKafkaSource, err := client.SourcesV1beta1().KafkaSources(c.Namespace).Create(context.Background(), kafkaSource, metav1.CreateOptions{}) + createdKafkaSource, err := client.SourcesV1().KafkaSources(c.Namespace).Create(context.Background(), kafkaSource, metav1.CreateOptions{}) if err != nil { return err } @@ -85,15 +84,15 @@ func CreateKafkaSourceV1Beta1OrFail(c *testlib.Client, kafkaSource *sourcesv1bet } } -func GetKafkaSourceV1Beta1OrFail(c *testlib.Client, kafkaSource string) *sourcesv1beta1.KafkaSource { +func GetKafkaSourceOrFail(c *testlib.Client, kafkaSource string) *sources.KafkaSource { client, err := kafkaclientset.NewForConfig(c.Config) if err != nil { c.T.Fatalf("Failed to create v1beta1 KafkaSource client: %v", err) } - var ksObj *sourcesv1beta1.KafkaSource + var ksObj *sources.KafkaSource err = c.RetryWebhookErrors(func(i int) error { - ksObj, err = client.SourcesV1beta1().KafkaSources(c.Namespace).Get(context.Background(), kafkaSource, metav1.GetOptions{}) + ksObj, err = client.SourcesV1().KafkaSources(c.Namespace).Get(context.Background(), kafkaSource, metav1.GetOptions{}) return err }) if err != nil { @@ -102,17 +101,17 @@ func GetKafkaSourceV1Beta1OrFail(c *testlib.Client, kafkaSource string) *sources return ksObj } -func UpdateKafkaSourceV1Beta1OrFail(c *testlib.Client, kafkaSource *sourcesv1beta1.KafkaSource) { +func UpdateKafkaSourceOrFail(c *testlib.Client, kafkaSource *sources.KafkaSource) { err := c.RetryWebhookErrors(func(i int) error { return retry.RetryOnConflict(retry.DefaultRetry, func() error { - latestKafkaSource := GetKafkaSourceV1Beta1OrFail(c, kafkaSource.Name) + latestKafkaSource := GetKafkaSourceOrFail(c, kafkaSource.Name) kafkaSource.Spec.DeepCopyInto(&latestKafkaSource.Spec) kafkaSourceClientSet, err := kafkaclientset.NewForConfig(c.Config) if err != nil { c.T.Fatalf("Failed to create v1beta1 KafkaSource client: %v", err) } - kSources := kafkaSourceClientSet.SourcesV1beta1().KafkaSources(c.Namespace) + kSources := kafkaSourceClientSet.SourcesV1().KafkaSources(c.Namespace) _, err = kSources.Update(context.Background(), latestKafkaSource, metav1.UpdateOptions{}) return err }) @@ -121,17 +120,3 @@ func UpdateKafkaSourceV1Beta1OrFail(c *testlib.Client, kafkaSource *sourcesv1bet c.T.Fatalf("Failed to update v1beta1 KafkaSource %q: %v", kafkaSource.Name, err) } } - -func CreateKafkaBindingV1Beta1OrFail(c *testlib.Client, kafkaBinding *bindingsv1beta1.KafkaBinding) { - kafkaBindingClientSet, err := kafkaclientset.NewForConfig(c.Config) - if err != nil { - c.T.Fatalf("Failed to create v1beta1 KafkaBinding client: %v", err) - } - - kBindings := kafkaBindingClientSet.BindingsV1beta1().KafkaBindings(c.Namespace) - if createdKafkaBinding, err := kBindings.Create(context.Background(), kafkaBinding, metav1.CreateOptions{}); err != nil { - c.T.Fatalf("Failed to create v1beta1 KafkaBinding %q: %v", kafkaBinding.Name, err) - } else { - c.Tracker.AddObj(createdKafkaBinding) - } -} diff --git a/test/lib/resources/kafkabinding.go b/test/lib/resources/kafkabinding.go deleted file mode 100644 index cf66db8f0f..0000000000 --- a/test/lib/resources/kafkabinding.go +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2023 The Knative Authors - * - * Licensed 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. - */ - -package resources - -import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - duckv1alpha1 "knative.dev/pkg/apis/duck/v1alpha1" - - kafkabindingv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1" - "knative.dev/pkg/tracker" -) - -func KafkaBindingV1Beta1(bootstrapServer string, ref *tracker.Reference) *kafkabindingv1beta1.KafkaBinding { - return &kafkabindingv1beta1.KafkaBinding{ - ObjectMeta: metav1.ObjectMeta{ - Name: "test-kafka-binding", - }, - Spec: kafkabindingv1beta1.KafkaBindingSpec{ - KafkaAuthSpec: kafkabindingv1beta1.KafkaAuthSpec{ - BootstrapServers: []string{bootstrapServer}, - }, - BindingSpec: duckv1alpha1.BindingSpec{ - Subject: *ref, - }, - }, - } -} diff --git a/test/lib/resources/kafkasource.go b/test/lib/resources/kafkasource.go index 3525123e8b..5e1e93b4c7 100644 --- a/test/lib/resources/kafkasource.go +++ b/test/lib/resources/kafkasource.go @@ -21,39 +21,39 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" duckv1 "knative.dev/pkg/apis/duck/v1" - kafkabindingv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1" - kafkasourcev1beta1 "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" ) -type KafkaSourceV1Beta1Option func(source *kafkasourcev1beta1.KafkaSource) +type KafkaSourceOption func(source *sources.KafkaSource) -func WithNameV1Beta1(name string) KafkaSourceV1Beta1Option { - return func(source *kafkasourcev1beta1.KafkaSource) { +func WithName(name string) KafkaSourceOption { + return func(source *sources.KafkaSource) { source.Name = name } } -func WithConsumerGroupV1Beta1(cg string) KafkaSourceV1Beta1Option { - return func(source *kafkasourcev1beta1.KafkaSource) { +func WithConsumerGroup(cg string) KafkaSourceOption { + return func(source *sources.KafkaSource) { source.Spec.ConsumerGroup = cg } } -func WithExtensionsV1Beta1(extensions map[string]string) KafkaSourceV1Beta1Option { - return func(source *kafkasourcev1beta1.KafkaSource) { +func WithExtensions(extensions map[string]string) KafkaSourceOption { + return func(source *sources.KafkaSource) { source.Spec.CloudEventOverrides = &duckv1.CloudEventOverrides{ Extensions: extensions, } } } -func KafkaSourceV1Beta1(bootstrapServer string, topicName string, ordering kafkasourcev1beta1.DeliveryOrdering, ref *corev1.ObjectReference, options ...KafkaSourceV1Beta1Option) *kafkasourcev1beta1.KafkaSource { - source := &kafkasourcev1beta1.KafkaSource{ +func KafkaSource(bootstrapServer string, topicName string, ordering sources.DeliveryOrdering, ref *corev1.ObjectReference, options ...KafkaSourceOption) *sources.KafkaSource { + source := &sources.KafkaSource{ ObjectMeta: metav1.ObjectMeta{ Name: "test-kafka-source", }, - Spec: kafkasourcev1beta1.KafkaSourceSpec{ - KafkaAuthSpec: kafkabindingv1beta1.KafkaAuthSpec{ + Spec: sources.KafkaSourceSpec{ + KafkaAuthSpec: bindings.KafkaAuthSpec{ BootstrapServers: []string{bootstrapServer}, }, Topics: []string{topicName}, diff --git a/test/rekt/features/kafka_source.go b/test/rekt/features/kafka_source.go index 28cef95052..5e8d027146 100644 --- a/test/rekt/features/kafka_source.go +++ b/test/rekt/features/kafka_source.go @@ -51,8 +51,7 @@ import ( "knative.dev/eventing-kafka-broker/test/rekt/resources/kafkasink" internalscg "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/internalskafkaeventing/v1alpha1" - sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1" - sourcesv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1" + sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1" consumergroupclient "knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/client" kafkaclient "knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/client" sourcesclient "knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/client" @@ -116,7 +115,7 @@ func deletedKafkaSourcesAreNotPresentInContractConfigMaps(prefix string) feature namespace := environment.FromContext(ctx).Namespace() - kss, err := kafkaclient.Get(ctx).SourcesV1beta1(). + kss, err := kafkaclient.Get(ctx).SourcesV1(). KafkaSources(namespace). List(ctx, metav1.ListOptions{ Limit: 2000, @@ -589,7 +588,7 @@ func KafkaSourceTLS(kafkaSource, kafkaSink, topic string) *feature.Feature { authMech: TLSMech, topic: topic, sourceName: kafkaSource, - opts: []manifest.CfgFn{kafkasource.WithOrdering(string(sourcesv1beta1.Ordered))}, + opts: []manifest.CfgFn{kafkasource.WithOrdering(string(sources.Ordered))}, }, kafkaSinkConfig{ sinkName: kafkaSink, @@ -754,7 +753,7 @@ func KafkaSourceWithEventAfterUpdate(kafkaSource, kafkaSink, topic string) *feat // Keep the original topic. kafkasource.WithTopics([]string{topic}), kafkasource.WithBootstrapServers(testingpkg.BootstrapServersPlaintextArr), - kafkasource.WithOrdering(string(sourcesv1beta1.Unordered)), + kafkasource.WithOrdering(string(sources.Unordered)), kafkasource.WithTLSDisabled(), kafkasource.WithSASLDisabled(), } diff --git a/test/rekt/features/keda_scaling.go b/test/rekt/features/keda_scaling.go index 1649b6d6c8..99e65d65b5 100644 --- a/test/rekt/features/keda_scaling.go +++ b/test/rekt/features/keda_scaling.go @@ -219,7 +219,7 @@ func getKafkaSourceCg(source string) getCgName { ns := environment.FromContext(ctx).Namespace() ks, err := sourcesclient.Get(ctx). - SourcesV1beta1(). + SourcesV1(). KafkaSources(ns). Get(ctx, source, metav1.GetOptions{}) if err != nil { diff --git a/test/rekt/resources/kafkasource/kafkasource.go b/test/rekt/resources/kafkasource/kafkasource.go index 32336ea981..0b7e85b455 100644 --- a/test/rekt/resources/kafkasource/kafkasource.go +++ b/test/rekt/resources/kafkasource/kafkasource.go @@ -33,7 +33,7 @@ import ( "knative.dev/reconciler-test/pkg/k8s" "knative.dev/reconciler-test/pkg/manifest" - sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1" + sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1" kafkaclientset "knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/client" ) @@ -41,7 +41,7 @@ import ( var yaml embed.FS func GVR() schema.GroupVersionResource { - return schema.GroupVersionResource{Group: "sources.knative.dev", Version: "v1beta1", Resource: "kafkasources"} + return schema.GroupVersionResource{Group: sources.SchemeGroupVersion.Group, Version: sources.SchemeGroupVersion.Version, Resource: "kafkasources"} } // Install will create a KafkaSource resource, using the latest version, augmented with the config fn options. @@ -66,7 +66,7 @@ func VerifyScale(name string, replicas int32) feature.StepFn { last := &sources.KafkaSource{} err := wait.PollImmediate(interval, timeout, func() (done bool, err error) { ks, err := kafkaclientset.Get(ctx). - SourcesV1beta1(). + SourcesV1(). KafkaSources(environment.FromContext(ctx).Namespace()). Get(ctx, name, metav1.GetOptions{}) if err != nil { diff --git a/test/upgrade/continual/sink_source.go b/test/upgrade/continual/sink_source.go index 0bc0dc653d..bdf306c59a 100644 --- a/test/upgrade/continual/sink_source.go +++ b/test/upgrade/continual/sink_source.go @@ -23,13 +23,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/utils/pointer" - bindings "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1" - sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1" "knative.dev/eventing/test/upgrade/prober/sut" "knative.dev/pkg/apis" duckv1 "knative.dev/pkg/apis/duck/v1" pkgupgrade "knative.dev/pkg/test/upgrade" + bindings "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1" + sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1" + eventingkafkatestlib "knative.dev/eventing-kafka-broker/test/lib" eventing "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/eventing/v1alpha1" @@ -123,7 +124,7 @@ func (k kafkaSinkSourceSut) deploySource(ctx sut.Context, destination duckv1.Des Spec: *k.Source.Spec.DeepCopy(), } ks.Spec.Sink = destination - eventingkafkatestlib.CreateKafkaSourceV1Beta1OrFail(ctx.Client, ks) + eventingkafkatestlib.CreateKafkaSourceOrFail(ctx.Client, ks) } func (k kafkaSinkSourceSut) fetchUrl(ctx sut.Context) *apis.URL { diff --git a/test/upgrade/continual/types.go b/test/upgrade/continual/types.go index eb70425177..b99d39a348 100644 --- a/test/upgrade/continual/types.go +++ b/test/upgrade/continual/types.go @@ -17,13 +17,15 @@ package continual import ( - sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1" "knative.dev/eventing/test/upgrade/prober" "knative.dev/eventing/test/upgrade/prober/sut" "knative.dev/eventing/test/upgrade/prober/wathola/event" - eventing "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/eventing/v1alpha1" + sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1" + eventingduckv1 "knative.dev/eventing/pkg/apis/duck/v1" + + eventing "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/eventing/v1alpha1" ) const (