Skip to content
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

Allow manage objects with scope Namespaced #314

Closed
wants to merge 1 commit into from
Closed

Allow manage objects with scope Namespaced #314

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
2 changes: 1 addition & 1 deletion pkg/reconciler/managed/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ func NewRetryingCriticalAnnotationUpdater(c client.Client) *RetryingCriticalAnno
func (u *RetryingCriticalAnnotationUpdater) UpdateCriticalAnnotations(ctx context.Context, o client.Object) error {
a := o.GetAnnotations()
err := retry.OnError(retry.DefaultRetry, resource.IsAPIError, func() error {
nn := types.NamespacedName{Name: o.GetName()}
nn := types.NamespacedName{Name: o.GetName(), Namespace: o.GetNamespace()}
if err := u.client.Get(ctx, nn, o); err != nil {
return err
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/reference/reference.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ func (r *APIResolver) Resolve(ctx context.Context, req ResolutionRequest) (Resol

// The reference is already set - resolve it.
if req.Reference != nil {
if err := r.client.Get(ctx, types.NamespacedName{Name: req.Reference.Name}, req.To.Managed); err != nil {
if err := r.client.Get(ctx, types.NamespacedName{Name: req.Reference.Name, Namespace: r.from.GetNamespace()}, req.To.Managed); err != nil {
return ResolutionResponse{}, errors.Wrap(err, errGetManaged)
}

Expand All @@ -224,7 +224,7 @@ func (r *APIResolver) Resolve(ctx context.Context, req ResolutionRequest) (Resol
}

// The reference was not set, but a selector was. Select a reference.
if err := r.client.List(ctx, req.To.List, client.MatchingLabels(req.Selector.MatchLabels)); err != nil {
if err := r.client.List(ctx, req.To.List, client.MatchingLabels(req.Selector.MatchLabels), client.InNamespace(r.from.GetNamespace())); err != nil {
return ResolutionResponse{}, errors.Wrap(err, errListManaged)
}

Expand Down Expand Up @@ -254,7 +254,7 @@ func (r *APIResolver) ResolveMultiple(ctx context.Context, req MultiResolutionRe
if len(req.References) > 0 {
vals := make([]string, len(req.References))
for i := range req.References {
if err := r.client.Get(ctx, types.NamespacedName{Name: req.References[i].Name}, req.To.Managed); err != nil {
if err := r.client.Get(ctx, types.NamespacedName{Name: req.References[i].Name, Namespace: r.from.GetNamespace()}, req.To.Managed); err != nil {
return MultiResolutionResponse{}, errors.Wrap(err, errGetManaged)
}
vals[i] = req.Extract(req.To.Managed)
Expand All @@ -265,7 +265,7 @@ func (r *APIResolver) ResolveMultiple(ctx context.Context, req MultiResolutionRe
}

// No references were set, but a selector was. Select and resolve references.
if err := r.client.List(ctx, req.To.List, client.MatchingLabels(req.Selector.MatchLabels)); err != nil {
if err := r.client.List(ctx, req.To.List, client.MatchingLabels(req.Selector.MatchLabels), client.InNamespace(r.from.GetNamespace())); err != nil {
return MultiResolutionResponse{}, errors.Wrap(err, errListManaged)
}

Expand Down
1 change: 1 addition & 0 deletions pkg/resource/providerconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ func (u *ProviderConfigUsageTracker) Track(ctx context.Context, mg Managed) erro
Kind: gvk.Kind,
Name: mg.GetName(),
})
pcu.SetNamespace(mg.GetNamespace())

err := u.c.Apply(ctx, pcu,
MustBeControllableBy(mg.GetUID()),
Expand Down