From 0ddc4ecc2b2d376d8390de0c68b2cd591be921ea Mon Sep 17 00:00:00 2001 From: "Maximilian Blatt (external expert on behalf of DB Netz)" Date: Thu, 9 Nov 2023 16:55:10 +0100 Subject: [PATCH] fix: Readd empty initializers after runtime update The default behaviour of a controller is to use `managed.NewNameWithExternalName`. Controllers need to pass `managed.WithInitializers()` to change the behaviour. After the runtime upgrade and tagging removal, some of the empty `managed.WithInitializers()` got removed resulting in a different behaviour. Readd them restore the previous behaviour. Signed-off-by: Maximilian Blatt (external expert on behalf of DB Netz) --- pkg/controller/ec2/address/controller.go | 1 + pkg/controller/ec2/instance/controller.go | 1 + pkg/controller/ec2/subnet/controller.go | 1 + pkg/controller/ec2/volume/setup.go | 1 + pkg/controller/ec2/vpc/controller.go | 1 + pkg/controller/ec2/vpcendpoint/setup.go | 1 + pkg/controller/eks/addon/setup.go | 1 + pkg/controller/elbv2/target/controller.go | 1 + pkg/controller/firehose/deliverystream/setup.go | 3 +-- pkg/controller/globalaccelerator/endpointgroup/setup.go | 1 + pkg/controller/kinesis/stream/setup.go | 3 +-- pkg/controller/mq/broker/setup.go | 1 + pkg/controller/mq/user/setup.go | 1 + .../prometheusservice/alertmanagerdefinition/setup.go | 1 + pkg/controller/prometheusservice/rulegroupsnamespace/setup.go | 1 + pkg/controller/prometheusservice/workspace/setup.go | 1 + pkg/controller/ram/resourceshare/setup.go | 1 + 17 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pkg/controller/ec2/address/controller.go b/pkg/controller/ec2/address/controller.go index 1f09e6fb72..952f365651 100644 --- a/pkg/controller/ec2/address/controller.go +++ b/pkg/controller/ec2/address/controller.go @@ -69,6 +69,7 @@ func SetupAddress(mgr ctrl.Manager, o controller.Options) error { managed.WithCreationGracePeriod(3 * time.Minute), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), 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/instance/controller.go b/pkg/controller/ec2/instance/controller.go index b922df621b..edf21b412f 100644 --- a/pkg/controller/ec2/instance/controller.go +++ b/pkg/controller/ec2/instance/controller.go @@ -69,6 +69,7 @@ func SetupInstance(mgr ctrl.Manager, o controller.Options) error { managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), newClientFn: ec2.NewInstanceClient}), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), 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/subnet/controller.go b/pkg/controller/ec2/subnet/controller.go index b66366de34..e699745e34 100644 --- a/pkg/controller/ec2/subnet/controller.go +++ b/pkg/controller/ec2/subnet/controller.go @@ -69,6 +69,7 @@ func SetupSubnet(mgr ctrl.Manager, o controller.Options) error { managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), newClientFn: ec2.NewSubnetClient}), managed.WithCreationGracePeriod(3 * time.Minute), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), + managed.WithInitializers(), managed.WithConnectionPublishers(), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), diff --git a/pkg/controller/ec2/volume/setup.go b/pkg/controller/ec2/volume/setup.go index 0512549fa6..6be4bee67a 100644 --- a/pkg/controller/ec2/volume/setup.go +++ b/pkg/controller/ec2/volume/setup.go @@ -50,6 +50,7 @@ func SetupVolume(mgr ctrl.Manager, o controller.Options) error { } reconcilerOpts := []managed.ReconcilerOption{ + managed.WithInitializers(), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), diff --git a/pkg/controller/ec2/vpc/controller.go b/pkg/controller/ec2/vpc/controller.go index 602906b966..d46c76d3f3 100644 --- a/pkg/controller/ec2/vpc/controller.go +++ b/pkg/controller/ec2/vpc/controller.go @@ -71,6 +71,7 @@ func SetupVPC(mgr ctrl.Manager, o controller.Options) error { managed.WithCreationGracePeriod(3 * time.Minute), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), 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/vpcendpoint/setup.go b/pkg/controller/ec2/vpcendpoint/setup.go index 5c0b8fec4e..943b5a9c49 100644 --- a/pkg/controller/ec2/vpcendpoint/setup.go +++ b/pkg/controller/ec2/vpcendpoint/setup.go @@ -40,6 +40,7 @@ func SetupVPCEndpoint(mgr ctrl.Manager, o controller.Options) error { managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), + managed.WithInitializers(), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), managed.WithConnectionPublishers(cps...), } diff --git a/pkg/controller/eks/addon/setup.go b/pkg/controller/eks/addon/setup.go index 7198275b4b..63634d4990 100644 --- a/pkg/controller/eks/addon/setup.go +++ b/pkg/controller/eks/addon/setup.go @@ -63,6 +63,7 @@ func SetupAddon(mgr ctrl.Manager, o controller.Options) error { reconcilerOpts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), + managed.WithInitializers(), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), diff --git a/pkg/controller/elbv2/target/controller.go b/pkg/controller/elbv2/target/controller.go index 9d897cb31e..2f7d5a5f66 100644 --- a/pkg/controller/elbv2/target/controller.go +++ b/pkg/controller/elbv2/target/controller.go @@ -59,6 +59,7 @@ func SetupTarget(mgr ctrl.Manager, o controller.Options) error { reconcilerOpts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), newClientFn: awselasticloadbalancingv2.NewFromConfig}), + managed.WithInitializers(), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), diff --git a/pkg/controller/firehose/deliverystream/setup.go b/pkg/controller/firehose/deliverystream/setup.go index 8de4e3eecb..60b01bf42c 100644 --- a/pkg/controller/firehose/deliverystream/setup.go +++ b/pkg/controller/firehose/deliverystream/setup.go @@ -59,8 +59,7 @@ 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.NewNameAsExternalName(mgr.GetClient())), + managed.WithInitializers(managed.NewNameAsExternalName(mgr.GetClient())), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), diff --git a/pkg/controller/globalaccelerator/endpointgroup/setup.go b/pkg/controller/globalaccelerator/endpointgroup/setup.go index 7cca5d6d2d..6812aae2f1 100644 --- a/pkg/controller/globalaccelerator/endpointgroup/setup.go +++ b/pkg/controller/globalaccelerator/endpointgroup/setup.go @@ -49,6 +49,7 @@ func SetupEndpointGroup(mgr ctrl.Manager, o controller.Options) error { Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.EndpointGroupGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), + 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/kinesis/stream/setup.go b/pkg/controller/kinesis/stream/setup.go index 1aab5a24f1..8a63a13326 100644 --- a/pkg/controller/kinesis/stream/setup.go +++ b/pkg/controller/kinesis/stream/setup.go @@ -59,8 +59,7 @@ func SetupStream(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.NewNameAsExternalName(mgr.GetClient())), + managed.WithInitializers(managed.NewNameAsExternalName(mgr.GetClient())), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), diff --git a/pkg/controller/mq/broker/setup.go b/pkg/controller/mq/broker/setup.go index d1d1c2a475..d0f2a08544 100644 --- a/pkg/controller/mq/broker/setup.go +++ b/pkg/controller/mq/broker/setup.go @@ -48,6 +48,7 @@ func SetupBroker(mgr ctrl.Manager, o controller.Options) error { } reconcilerOpts := []managed.ReconcilerOption{ + managed.WithInitializers(), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), diff --git a/pkg/controller/mq/user/setup.go b/pkg/controller/mq/user/setup.go index a76646d425..f88326b8c8 100644 --- a/pkg/controller/mq/user/setup.go +++ b/pkg/controller/mq/user/setup.go @@ -47,6 +47,7 @@ func SetupUser(mgr ctrl.Manager, o controller.Options) error { } reconcilerOpts := []managed.ReconcilerOption{ + managed.WithInitializers(), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), diff --git a/pkg/controller/prometheusservice/alertmanagerdefinition/setup.go b/pkg/controller/prometheusservice/alertmanagerdefinition/setup.go index b40a097641..c11e728be4 100644 --- a/pkg/controller/prometheusservice/alertmanagerdefinition/setup.go +++ b/pkg/controller/prometheusservice/alertmanagerdefinition/setup.go @@ -47,6 +47,7 @@ func SetupAlertManagerDefinition(mgr ctrl.Manager, o controller.Options) error { reconcilerOpts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), + 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/prometheusservice/rulegroupsnamespace/setup.go b/pkg/controller/prometheusservice/rulegroupsnamespace/setup.go index 603f8eb3c7..0de0edc84b 100644 --- a/pkg/controller/prometheusservice/rulegroupsnamespace/setup.go +++ b/pkg/controller/prometheusservice/rulegroupsnamespace/setup.go @@ -47,6 +47,7 @@ func SetupRuleGroupsNamespace(mgr ctrl.Manager, o controller.Options) error { reconcilerOpts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), + 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/prometheusservice/workspace/setup.go b/pkg/controller/prometheusservice/workspace/setup.go index 85107544d4..16c06dae43 100644 --- a/pkg/controller/prometheusservice/workspace/setup.go +++ b/pkg/controller/prometheusservice/workspace/setup.go @@ -41,6 +41,7 @@ func SetupWorkspace(mgr ctrl.Manager, o controller.Options) error { reconcilerOpts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), + 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/ram/resourceshare/setup.go b/pkg/controller/ram/resourceshare/setup.go index e5e2a792ed..db3a460720 100644 --- a/pkg/controller/ram/resourceshare/setup.go +++ b/pkg/controller/ram/resourceshare/setup.go @@ -51,6 +51,7 @@ func SetupResourceShare(mgr ctrl.Manager, o controller.Options) error { } reconcilerOpts := []managed.ReconcilerOption{ + managed.WithInitializers(), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)),