Skip to content

Reorder account ID lookup in getOwnerAccountID #153

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

Merged
ack-prow merged 1 commit into from
Jul 31, 2024
Merged

Reorder account ID lookup in getOwnerAccountID #153

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
25 changes: 12 additions & 13 deletions pkg/runtime/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1054,14 +1054,14 @@ func (r *resourceReconciler) HandleReconcileError(
}

// getOwnerAccountID returns the AWS account that owns the supplied resource.
// The function looks to the common `Status.ACKResourceState` object, followed
// by the default AWS account ID associated with the Kubernetes Namespace in
// which the CR was created, followed by the AWS Account in which the IAM Role
// that the service controller is in.
// The function looks first to the default AWS account ID associated with the
// Kubernetes Namespace in which the CR was created, followed by the common
// `status.ackResourceMetadata` object, and finally the AWS Account in which the
// IAM Role that the service controller is in.
//
// This function is also returning a boolean stating whether the account ID
// is retrieved from the namespace annotations. This information is used to
// determine whether the a role ARN should be assumed to manage the resource,
// determine whether a role ARN should be assumed to manage the resource,
// which is typically found in the CARM ConfigMap.
//
// If the returned boolean is true, it means that the resource is owned by
Expand All @@ -1070,21 +1070,20 @@ func (r *resourceReconciler) HandleReconcileError(
func (r *resourceReconciler) getOwnerAccountID(
res acktypes.AWSResource,
) (ackv1alpha1.AWSAccountID, bool) {
controllerAccountID := ackv1alpha1.AWSAccountID(r.cfg.AccountID)

// look for owner account id in the resource status
acctID := res.Identifiers().OwnerAccountID()
if acctID != nil {
return *acctID, *acctID != controllerAccountID
}

// look for owner account id in the namespace annotations
namespace := res.MetaObject().GetNamespace()
accID, ok := r.cache.Namespaces.GetOwnerAccountID(namespace)
if ok {
return ackv1alpha1.AWSAccountID(accID), true
}

controllerAccountID := ackv1alpha1.AWSAccountID(r.cfg.AccountID)
// look for owner account id in the resource status
acctID := res.Identifiers().OwnerAccountID()
if acctID != nil {
return *acctID, *acctID != controllerAccountID
}

// use controller configuration
return controllerAccountID, false
}
Expand Down