Skip to content

Commit 10d1b53

Browse files
Ensure adopted resources are managed (#10)
* Ensure adopted resources are managed Fixes aws-controllers-k8s/community#746
1 parent 8cff8f7 commit 10d1b53

File tree

4 files changed

+32
-8
lines changed

4 files changed

+32
-8
lines changed

mocks/pkg/types/reconciler.go

Lines changed: 10 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mocks/pkg/types/service_controller.go

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/runtime/reconciler.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,11 @@ func (r *resourceReconciler) Sync(
237237
"arn", latest.Identifiers().ARN(),
238238
)
239239
} else {
240+
// Ensure the resource is always managed (adopted resources apply)
241+
if err = r.setResourceManaged(ctx, desired); err != nil {
242+
return err
243+
}
244+
240245
// Check to see if the latest observed state already matches the
241246
// desired state and if not, update the resource
242247
delta := r.rd.Delta(desired, latest)

pkg/runtime/reconciler_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ func TestReconcilerUpdate(t *testing.T) {
8989
delta,
9090
)
9191
rd.On("UpdateCRStatus", latest).Return(false, nil)
92+
rd.On("IsManaged", desired).Return(true)
9293

9394
rm := &ackmocks.AWSResourceManager{}
9495
rm.On("ReadOne", ctx, desired).Return(

0 commit comments

Comments
 (0)