From 9e4b8504ae97094d677c9fc2c9bd0e61bbfee6cc Mon Sep 17 00:00:00 2001 From: "Domene Esteban, Nil {DISB~SANT CUGAT DIA}" Date: Tue, 17 Oct 2023 14:12:41 +0200 Subject: [PATCH] bug with external name firehose fixed --- examples/firehose/deliverystream.yaml | 2 +- pkg/controller/firehose/deliverystream/setup.go | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/examples/firehose/deliverystream.yaml b/examples/firehose/deliverystream.yaml index 93feb48f85..6a70ee3f22 100644 --- a/examples/firehose/deliverystream.yaml +++ b/examples/firehose/deliverystream.yaml @@ -6,7 +6,7 @@ spec: forProvider: region: us-east-1 deliveryStreamName: firehose-deliverystream - deliveryStreamType: KinesisStreamAsSource + deliveryStreamType: DirectPut extendedS3DestinationConfiguration: roleARN: arn:aws:iam::000000000000:role/Firehose-Example-Role bucketARN: arn:aws:s3:::bucket-example diff --git a/pkg/controller/firehose/deliverystream/setup.go b/pkg/controller/firehose/deliverystream/setup.go index 4b2a52e41d..3a737b36af 100644 --- a/pkg/controller/firehose/deliverystream/setup.go +++ b/pkg/controller/firehose/deliverystream/setup.go @@ -58,6 +58,10 @@ func SetupDeliveryStream(mgr ctrl.Manager, o controller.Options) error { reconcilerOpts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), + managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), + managed.WithInitializers( + managed.NewDefaultProviderConfig(mgr.GetClient()), + managed.NewNameAsExternalName(mgr.GetClient())), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), @@ -121,6 +125,5 @@ func postCreate(_ context.Context, cr *svcapitypes.DeliveryStream, obj *svcsdk.C if err != nil { return managed.ExternalCreation{}, err } - meta.SetExternalName(cr, cr.Name) return managed.ExternalCreation{ExternalNameAssigned: true}, nil }