From b0a443a7d07654d45d7063123d8e4aefcdef7e60 Mon Sep 17 00:00:00 2001 From: Calum Murray Date: Wed, 22 Nov 2023 15:49:55 -0500 Subject: [PATCH] Pass the owner references to the data plane Signed-off-by: Calum Murray --- control-plane/pkg/reconciler/broker/broker.go | 8 +++++--- control-plane/pkg/reconciler/channel/channel.go | 8 +++++--- control-plane/pkg/reconciler/channel/v2/channelv2.go | 8 +++++--- control-plane/pkg/reconciler/sink/kafka_sink.go | 9 ++++++--- control-plane/pkg/reconciler/testing/objects_broker.go | 8 +++++--- control-plane/pkg/reconciler/testing/objects_channel.go | 8 +++++--- control-plane/pkg/reconciler/testing/objects_sink.go | 8 +++++--- 7 files changed, 36 insertions(+), 21 deletions(-) diff --git a/control-plane/pkg/reconciler/broker/broker.go b/control-plane/pkg/reconciler/broker/broker.go index 014c6d35f0..2433cae62b 100644 --- a/control-plane/pkg/reconciler/broker/broker.go +++ b/control-plane/pkg/reconciler/broker/broker.go @@ -617,9 +617,11 @@ func (r *Reconciler) reconcilerBrokerResource(ctx context.Context, topic string, }, BootstrapServers: config.GetBootstrapServers(), Reference: &contract.Reference{ - Uuid: string(broker.GetUID()), - Namespace: broker.GetNamespace(), - Name: broker.GetName(), + Uuid: string(broker.GetUID()), + Namespace: broker.GetNamespace(), + Name: broker.GetName(), + Kind: "Broker", + GroupVersion: eventing.SchemeGroupVersion.String(), }, } diff --git a/control-plane/pkg/reconciler/channel/channel.go b/control-plane/pkg/reconciler/channel/channel.go index a638cb1993..293e009ff6 100644 --- a/control-plane/pkg/reconciler/channel/channel.go +++ b/control-plane/pkg/reconciler/channel/channel.go @@ -676,9 +676,11 @@ func (r *Reconciler) getChannelContractResource(ctx context.Context, topic strin }, BootstrapServers: config.GetBootstrapServers(), Reference: &contract.Reference{ - Uuid: string(channel.GetUID()), - Namespace: channel.GetNamespace(), - Name: channel.GetName(), + Uuid: string(channel.GetUID()), + Namespace: channel.GetNamespace(), + Name: channel.GetName(), + Kind: "KafkaChannel", + GroupVersion: messagingv1beta1.SchemeGroupVersion.String(), }, } diff --git a/control-plane/pkg/reconciler/channel/v2/channelv2.go b/control-plane/pkg/reconciler/channel/v2/channelv2.go index 09e4d95049..e00978bf6c 100644 --- a/control-plane/pkg/reconciler/channel/v2/channelv2.go +++ b/control-plane/pkg/reconciler/channel/v2/channelv2.go @@ -674,9 +674,11 @@ func (r *Reconciler) getChannelContractResource(ctx context.Context, topic strin }, BootstrapServers: config.GetBootstrapServers(), Reference: &contract.Reference{ - Uuid: string(channel.GetUID()), - Namespace: channel.GetNamespace(), - Name: channel.GetName(), + Uuid: string(channel.GetUID()), + Namespace: channel.GetNamespace(), + Name: channel.GetName(), + Kind: "KafkaChannel", + GroupVersion: messagingv1beta1.SchemeGroupVersion.String(), }, } diff --git a/control-plane/pkg/reconciler/sink/kafka_sink.go b/control-plane/pkg/reconciler/sink/kafka_sink.go index 41fdb89f57..936c95dfa4 100644 --- a/control-plane/pkg/reconciler/sink/kafka_sink.go +++ b/control-plane/pkg/reconciler/sink/kafka_sink.go @@ -36,6 +36,7 @@ import ( "knative.dev/eventing-kafka-broker/control-plane/pkg/config" "knative.dev/eventing-kafka-broker/control-plane/pkg/contract" + eventingv1alpha1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/eventing/v1alpha1" coreconfig "knative.dev/eventing-kafka-broker/control-plane/pkg/core/config" "knative.dev/eventing-kafka-broker/control-plane/pkg/kafka" kafkalogging "knative.dev/eventing-kafka-broker/control-plane/pkg/logging" @@ -187,9 +188,11 @@ func (r *Reconciler) reconcileKind(ctx context.Context, ks *eventing.KafkaSink) }, BootstrapServers: kafka.BootstrapServersCommaSeparated(ks.Spec.BootstrapServers), Reference: &contract.Reference{ - Uuid: string(ks.GetUID()), - Namespace: ks.GetNamespace(), - Name: ks.GetName(), + Uuid: string(ks.GetUID()), + Namespace: ks.GetNamespace(), + Name: ks.GetName(), + Kind: "KafkaSink", + GroupVersion: eventingv1alpha1.SchemeGroupVersion.String(), }, } if ks.Spec.HasAuthConfig() { diff --git a/control-plane/pkg/reconciler/testing/objects_broker.go b/control-plane/pkg/reconciler/testing/objects_broker.go index f3f37a992a..e07e79ce9d 100644 --- a/control-plane/pkg/reconciler/testing/objects_broker.go +++ b/control-plane/pkg/reconciler/testing/objects_broker.go @@ -381,9 +381,11 @@ func brokerAddressable(broker *eventing.Broker, serviceName, serviceNamespace st func BrokerReference() *contract.Reference { return &contract.Reference{ - Uuid: BrokerUUID, - Namespace: BrokerNamespace, - Name: BrokerName, + Uuid: BrokerUUID, + Namespace: BrokerNamespace, + Name: BrokerName, + Kind: "Broker", + GroupVersion: eventing.SchemeGroupVersion.String(), } } diff --git a/control-plane/pkg/reconciler/testing/objects_channel.go b/control-plane/pkg/reconciler/testing/objects_channel.go index b59b6c1875..b87873c204 100644 --- a/control-plane/pkg/reconciler/testing/objects_channel.go +++ b/control-plane/pkg/reconciler/testing/objects_channel.go @@ -256,9 +256,11 @@ func WithChannelTopicStatusAnnotation(topicName string) func(obj duckv1.KRShaped func ChannelReference() *contract.Reference { return &contract.Reference{ - Uuid: ChannelUUID, - Namespace: ChannelNamespace, - Name: ChannelName, + Uuid: ChannelUUID, + Namespace: ChannelNamespace, + Name: ChannelName, + Kind: "KafkaChannel", + GroupVersion: messagingv1beta1.SchemeGroupVersion.String(), } } diff --git a/control-plane/pkg/reconciler/testing/objects_sink.go b/control-plane/pkg/reconciler/testing/objects_sink.go index b9a35ad431..cf7f094c7b 100644 --- a/control-plane/pkg/reconciler/testing/objects_sink.go +++ b/control-plane/pkg/reconciler/testing/objects_sink.go @@ -131,9 +131,11 @@ func SinkAddressable(configs *config.Env) func(obj duckv1.KRShaped) { func SinkReference() *contract.Reference { return &contract.Reference{ - Uuid: SinkUUID, - Namespace: SinkNamespace, - Name: SinkName, + Uuid: SinkUUID, + Namespace: SinkNamespace, + Name: SinkName, + Kind: "KafkaSink", + GroupVersion: eventing.SchemeGroupVersion.String(), } }