Skip to content

fix: report adoption/readonly not found errors in condition #270

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
michaelhtm wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −2
Open

fix: report adoption/readonly not found errors in condition #270

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
15 changes: 15 additions & 0 deletions pkg/condition/condition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,21 @@ func WithTerminalCondition(
return ko
}

// WithRecoverableCondition returns a new AWSResource with the
// ConditionTypeRecoverable set based on the err parameter
func WithRecoverableCondition(
resource acktypes.AWSResource,
err error,
) acktypes.AWSResource {
ko := resource.DeepCopy()

if err != nil {
errString := err.Error()
SetRecoverable(ko, corev1.ConditionTrue, &errString, nil)
}
return ko
}

// LateInitializationInProgress return true if ConditionTypeLateInitialized has "False" status
// False status means that resource has LateInitializationConfig but has not been completely
// late initialized yet.
Expand Down
4 changes: 2 additions & 2 deletions pkg/runtime/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,10 +662,10 @@ func (r *resourceReconciler) Sync(
return latest, err
}
if adoptionPolicy == AdoptionPolicy_Adopt || isAdopted {
return nil, ackerr.AdoptedResourceNotFound
return ackcondition.WithRecoverableCondition(desired, ackerr.AdoptedResourceNotFound), ackerr.AdoptedResourceNotFound
}
if isReadOnly {
return nil, ackerr.ReadOnlyResourceNotFound
return ackcondition.WithRecoverableCondition(desired, ackerr.ReadOnlyResourceNotFound), ackerr.ReadOnlyResourceNotFound
}
if latest, err = r.createResource(ctx, rm, resolved); err != nil {
return latest, err
Expand Down