Skip to content

fix: ProviderConfig reconciler to filter usages by namespace #936

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

fix: ProviderConfig reconciler to filter usages by namespace #936

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
8 changes: 7 additions & 1 deletion pkg/reconciler/providerconfig/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req reconcile.Request) (reco
"uid", pc.GetUID(),
"version", pc.GetResourceVersion(),
"name", pc.GetName(),
"namespace", pc.GetNamespace(),
)

l := r.newUsageList()
Expand All @@ -178,7 +179,12 @@ func (r *Reconciler) Reconcile(ctx context.Context, req reconcile.Request) (reco
matchingLabels[xpv1.LabelKeyProviderKind] = pc.GetObjectKind().GroupVersionKind().Kind
}

if err := r.client.List(ctx, l, matchingLabels); err != nil {
listOpts := []client.ListOption{matchingLabels}
if pc.GetNamespace() != "" {
listOpts = append(listOpts, client.InNamespace(pc.GetNamespace()))
}

if err := r.client.List(ctx, l, listOpts...); err != nil {
log.Debug(errListPCUs, "error", err)
r.record.Event(pc, event.Warning(reasonAccount, errors.Wrap(err, errListPCUs)))

Expand Down
83 changes: 80 additions & 3 deletions pkg/reconciler/providerconfig/reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,9 @@ func TestReconciler(t *testing.T) {
}

type want struct {
result reconcile.Result
err error
result reconcile.Result
err error
request reconcile.Request
}

cases := map[string]struct {
Expand Down Expand Up @@ -333,13 +334,89 @@ func TestReconciler(t *testing.T) {
result: reconcile.Result{Requeue: false},
},
},
"ListUsagesScopedToNamespaceWhenNamespaced": {
reason: "When ProviderConfig is namespaced, List should be called with InNamespace option",
args: args{
m: &fake.Manager{
Client: &test.MockClient{
MockGet: test.NewMockGetFn(nil, func(obj client.Object) error {
pc := obj.(*fake.ProviderConfig)
pc.SetNamespace("test-ns")
pc.SetName("my-pc")
return nil
}),
MockList: func(ctx context.Context, list client.ObjectList, opts ...client.ListOption) error {
// Capture and verify list options: should include InNamespace("test-ns")
listOpts := &client.ListOptions{}
for _, opt := range opts {
opt.ApplyToList(listOpts)
}
if listOpts.Namespace != "test-ns" {
t.Errorf("List called with namespace %q, want InNamespace(\"test-ns\")", listOpts.Namespace)
}
return nil
},
MockUpdate: test.NewMockUpdateFn(nil),
MockStatusUpdate: test.NewMockSubResourceUpdateFn(nil),
},
Scheme: fake.SchemeWith(&fake.ProviderConfig{}, &fake.ProviderConfigUsage{}, &ProviderConfigUsageList{}),
},
of: resource.ProviderConfigKinds{
Config: fake.GVK(&fake.ProviderConfig{}),
Usage: fake.GVK(&fake.ProviderConfigUsage{}),
UsageList: fake.GVK(&ProviderConfigUsageList{}),
},
},
want: want{
result: reconcile.Result{Requeue: false},
request: reconcile.Request{NamespacedName: types.NamespacedName{Name: "my-pc", Namespace: "test-ns"}},
},
},
"ListUsagesNotScopedToNamespaceWhenClusterScoped": {
reason: "When ProviderConfig is cluster-scoped (empty namespace), List should not include InNamespace",
args: args{
m: &fake.Manager{
Client: &test.MockClient{
MockGet: test.NewMockGetFn(nil, func(obj client.Object) error {
pc := obj.(*fake.ProviderConfig)
pc.SetNamespace("") // cluster-scoped
pc.SetName("my-pc")
return nil
}),
MockList: func(ctx context.Context, list client.ObjectList, opts ...client.ListOption) error {
listOpts := &client.ListOptions{}
for _, opt := range opts {
opt.ApplyToList(listOpts)
}
if listOpts.Namespace != "" {
t.Errorf("List called with namespace %q for cluster-scoped ProviderConfig, want empty", listOpts.Namespace)
}
return nil
},
MockUpdate: test.NewMockUpdateFn(nil),
MockStatusUpdate: test.NewMockSubResourceUpdateFn(nil),
},
Scheme: fake.SchemeWith(&fake.ProviderConfig{}, &fake.ProviderConfigUsage{}, &ProviderConfigUsageList{}),
},
of: resource.ProviderConfigKinds{
Config: fake.GVK(&fake.ProviderConfig{}),
Usage: fake.GVK(&fake.ProviderConfigUsage{}),
UsageList: fake.GVK(&ProviderConfigUsageList{}),
},
},
want: want{
result: reconcile.Result{Requeue: false},
request: reconcile.Request{NamespacedName: types.NamespacedName{Name: "my-pc"}},
},
},
}

for name, tc := range cases {
t.Run(name, func(t *testing.T) {
r := NewReconciler(tc.args.m, tc.args.of)

got, err := r.Reconcile(context.Background(), reconcile.Request{})
req := tc.want.request
got, err := r.Reconcile(context.Background(), req)
if diff := cmp.Diff(tc.want.err, err, test.EquateErrors()); diff != "" {
t.Errorf("\n%s\nr.Reconcile(...): -want error, +got error:\n%s", tc.reason, diff)
}
Expand Down