Skip to content

Commit

Permalink
fix: Readd empty initializers after runtime update
Browse files Browse the repository at this point in the history 
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) <[email protected]>
  • Loading branch information
@MisterMX
MisterMX committed Nov 9, 2023
1 parent f4b5949 commit 0ddc4ec
Show file tree
Hide file tree
Showing 17 changed files with 17 additions and 4 deletions.
1 change: 1 addition & 0 deletions pkg/controller/ec2/address/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/ec2/instance/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/ec2/subnet/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/ec2/volume/setup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/ec2/vpc/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/ec2/vpcendpoint/setup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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...),
}
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/eks/addon/setup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/elbv2/target/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down
3 changes: 1 addition & 2 deletions pkg/controller/firehose/deliverystream/setup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/globalaccelerator/endpointgroup/setup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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))),
Expand Down
3 changes: 1 addition & 2 deletions pkg/controller/kinesis/stream/setup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/mq/broker/setup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/mq/user/setup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/prometheusservice/alertmanagerdefinition/setup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/prometheusservice/rulegroupsnamespace/setup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/prometheusservice/workspace/setup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/ram/resourceshare/setup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down

0 comments on commit 0ddc4ec

Please sign in to comment.