Skip to content

Improve handling of missing namespace in SecretKeyReference #146

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
Mar 27, 2024
Merged

Improve handling of missing namespace in SecretKeyReference #146

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: 13 additions & 2 deletions pkg/runtime/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,18 @@ func (r *reconciler) SecretValueFromReference(
}

namespace := ref.Namespace
if namespace == "" {
namespace = "default"
// During the reconcile process, the resourceNamespace is stored in the context
// and can be used to fetch the secret if the namespace is not provided in the
// SecretKeyReference.
//
// NOTE(a-hilaly): When refactoring the runtime, we might want to consider passing
// the ObjectMeta in the context.
ctxResourceNamespace := ctx.Value("resourceNamespace")
if namespace == "" && ctxResourceNamespace != nil {
ctxNamespace, ok := ctxResourceNamespace.(string)
if ok {
namespace = ctxNamespace
}
}

nsn := client.ObjectKey{
Expand Down Expand Up @@ -175,6 +185,7 @@ func (r *resourceReconciler) Reconcile(ctx context.Context, req ctrlrt.Request)
// We're storing a logger pointer in the context, so that any changes to the logger
// will be reflected in the context.
ctx = context.WithValue(ctx, ackrtlog.ContextKey, rlog)
ctx = context.WithValue(ctx, "resourceNamespace", req.Namespace)

// If a user has specified a namespace that is annotated with the
// an owner account ID, we need an appropriate role ARN to assume
Expand Down