Skip to content

feat: add hook into resource adoption #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexwang0311 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add hook into resource adoption #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions mocks/pkg/types/aws_resource_manager.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions pkg/runtime/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,10 @@ func (r *resourceReconciler) Sync(
if err != nil {
return latest, err
}
latest, err = rm.OnAdopted(ctx, latest)
if err != nil {
return latest, err
}
} else if isReadOnly {
delta := r.rd.Delta(desired, latest)
if delta.DifferentAt("Spec") {
Expand All @@ -616,6 +620,9 @@ func (r *resourceReconciler) Sync(
if err = r.setResourceManagedAndAdopted(ctx, rm, latest); err != nil {
return latest, err
}
if latest, err = rm.OnAdopted(ctx, latest); err != nil {
return latest, err
}
err = requeue.Needed(fmt.Errorf("adopted resource, requeuing to check for updates"))
return latest, err
}
Expand Down
2 changes: 2 additions & 0 deletions pkg/runtime/reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@ func TestReconcilerAdoptResource(t *testing.T) {
rm.On("FilterSystemTags", latest, []string{})
rd.On("MarkAdopted", latest).Return()
rm.On("EnsureTags", ctx, desired, scmd).Return(nil)
rm.On("OnAdopted", ctx, latest).Return(latest, nil)
statusWriter := &ctrlrtclientmock.SubResourceWriter{}
kc.On("Patch", withoutCancelContextMatcher, latestRTObj, mock.AnythingOfType("*client.mergeFromPatch")).Return(nil)
kc.On("Status").Return(statusWriter)
Expand Down Expand Up @@ -559,6 +560,7 @@ func TestReconcilerAdoptOrCreateResource_Adopt(t *testing.T) {

r, kc, scmd := reconcilerMocks(rmf)
rm.On("EnsureTags", ctx, desired, scmd).Return(nil)
rm.On("OnAdopted", ctx, latest).Return(latest, nil)
statusWriter := &ctrlrtclientmock.SubResourceWriter{}
kc.On("Status").Return(statusWriter)
kc.On("Patch", withoutCancelContextMatcher, latestRTObj, mock.AnythingOfType("*client.mergeFromPatch")).Return(nil)
Expand Down
4 changes: 4 additions & 0 deletions pkg/types/aws_resource_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ type AWSResourceManager interface {
// Eg. resources created with cloudformation have tags that cannot be
//removed by an ACK controller
FilterSystemTags(AWSResource, []string)
// OnAdopted is called after a resource has been successfully adopted
// and marked as managed. Controllers can use this hook to perform
// custom post-adoption logic.
OnAdopted(context.Context, AWSResource) (AWSResource, error)
}

// AWSResourceManagerFactory returns an AWSResourceManager that can be used to
Expand Down