From 4a7c450038392cdd29e75e5c778e92f1881a437f Mon Sep 17 00:00:00 2001 From: "Charel Baum (external expert on behalf of DB Netz AG)" Date: Mon, 13 Nov 2023 17:03:51 +0100 Subject: [PATCH] fix: readd missed empty initializers after tagging removal Signed-off-by: Charel Baum (external expert on behalf of DB Netz AG) (cherry picked from commit 2cf936fdbd2ab9e03d9b687a17b2a59eabe5ac65) --- pkg/controller/acm/controller.go | 1 + pkg/controller/acmpca/certificateauthority/controller.go | 1 + pkg/controller/ec2/transitgatewayvpcattachment/setup.go | 1 + pkg/controller/ec2/vpcpeeringconnection/setup.go | 1 + pkg/controller/iam/openidconnectprovider/controller.go | 1 + pkg/controller/iam/policy/controller.go | 1 + 6 files changed, 6 insertions(+) diff --git a/pkg/controller/acm/controller.go b/pkg/controller/acm/controller.go index 6f69d8dcfc..c34aa9e384 100644 --- a/pkg/controller/acm/controller.go +++ b/pkg/controller/acm/controller.go @@ -67,6 +67,7 @@ func SetupCertificate(mgr ctrl.Manager, o controller.Options) error { reconcilerOpts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&connector{client: mgr.GetClient(), newClientFn: acm.NewClient}), managed.WithConnectionPublishers(), + managed.WithInitializers(), managed.WithPollInterval(o.PollInterval), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), managed.WithLogger(o.Logger.WithValues("controller", name)), diff --git a/pkg/controller/acmpca/certificateauthority/controller.go b/pkg/controller/acmpca/certificateauthority/controller.go index b808553593..659a06b79c 100644 --- a/pkg/controller/acmpca/certificateauthority/controller.go +++ b/pkg/controller/acmpca/certificateauthority/controller.go @@ -69,6 +69,7 @@ func SetupCertificateAuthority(mgr ctrl.Manager, o controller.Options) error { reconcilerOpts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&connector{client: mgr.GetClient(), newClientFn: acmpca.NewClient}), managed.WithConnectionPublishers(), + managed.WithInitializers(), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), diff --git a/pkg/controller/ec2/transitgatewayvpcattachment/setup.go b/pkg/controller/ec2/transitgatewayvpcattachment/setup.go index 87f544f9e1..77e30939c6 100644 --- a/pkg/controller/ec2/transitgatewayvpcattachment/setup.go +++ b/pkg/controller/ec2/transitgatewayvpcattachment/setup.go @@ -44,6 +44,7 @@ func SetupTransitGatewayVPCAttachment(mgr ctrl.Manager, o controller.Options) er reconcilerOpts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), managed.WithLogger(o.Logger.WithValues("controller", name)), + managed.WithInitializers(), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), managed.WithConnectionPublishers(cps...), } diff --git a/pkg/controller/ec2/vpcpeeringconnection/setup.go b/pkg/controller/ec2/vpcpeeringconnection/setup.go index d55049b88f..ebdcaf6a0d 100644 --- a/pkg/controller/ec2/vpcpeeringconnection/setup.go +++ b/pkg/controller/ec2/vpcpeeringconnection/setup.go @@ -49,6 +49,7 @@ func SetupVPCPeeringConnection(mgr ctrl.Manager, o controller.Options) error { managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), managed.WithCreationGracePeriod(3 * time.Minute), managed.WithLogger(o.Logger.WithValues("controller", name)), + managed.WithInitializers(), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), managed.WithConnectionPublishers(cps...), } diff --git a/pkg/controller/iam/openidconnectprovider/controller.go b/pkg/controller/iam/openidconnectprovider/controller.go index c081077d27..d5c3268ae9 100644 --- a/pkg/controller/iam/openidconnectprovider/controller.go +++ b/pkg/controller/iam/openidconnectprovider/controller.go @@ -73,6 +73,7 @@ func SetupOpenIDConnectProvider(mgr ctrl.Manager, o controller.Options) error { reconcilerOpts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), newClientFn: iam.NewOpenIDConnectProviderClient}), managed.WithPollInterval(o.PollInterval), + managed.WithInitializers(), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), managed.WithConnectionPublishers(cps...), diff --git a/pkg/controller/iam/policy/controller.go b/pkg/controller/iam/policy/controller.go index 84e8c6b49f..d325d7e433 100644 --- a/pkg/controller/iam/policy/controller.go +++ b/pkg/controller/iam/policy/controller.go @@ -72,6 +72,7 @@ func SetupPolicy(mgr ctrl.Manager, o controller.Options) error { reconcilerOpts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), newClientFn: iam.NewPolicyClient, newSTSClientFn: iam.NewSTSClient}), managed.WithConnectionPublishers(), + managed.WithInitializers(), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),