fix: forward context in pkg/cluster (#921)

Signed-off-by: Francesco Ilario <filario@redhat.com> Co-authored-by: Alexey Kazakov <alkazako@redhat.com> Co-authored-by: Matous Jobanek <mjobanek@redhat.com>
codeready-toolchain · Nov 8, 2023 · 18d6497 · 18d6497
1 parent 567e867
commit 18d6497
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/controllers/spacebindingcleanup/spacebinding_cleanup_controller.go b/controllers/spacebindingcleanup/spacebinding_cleanup_controller.go
@@ -150,7 +150,7 @@ func (r *Reconciler) deleteSpaceBindingRequest(ctx context.Context, sbrAssociate
 	logger := log.FromContext(ctx)
 
 	spaceBindingRequest := &toolchainv1alpha1.SpaceBindingRequest{}
-	memberClusterWithSpaceBindingRequest, found, err := cluster.LookupMember(r.MemberClusters, types.NamespacedName{
+	memberClusterWithSpaceBindingRequest, found, err := cluster.LookupMember(ctx, r.MemberClusters, types.NamespacedName{
 		Namespace: sbrAssociated.namespace,
 		Name:      sbrAssociated.name,
 	}, spaceBindingRequest)

diff --git a/controllers/spacebindingrequest/spacebindingrequest_controller.go b/controllers/spacebindingrequest/spacebindingrequest_controller.go
@@ -68,7 +68,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.
 	// Fetch the SpaceBindingRequest
 	// search on all member clusters
 	spaceBindingRequest := &toolchainv1alpha1.SpaceBindingRequest{}
-	memberClusterWithSpaceBindingRequest, found, err := cluster.LookupMember(r.MemberClusters, types.NamespacedName{
+	memberClusterWithSpaceBindingRequest, found, err := cluster.LookupMember(ctx, r.MemberClusters, types.NamespacedName{
 		Namespace: request.Namespace,
 		Name:      request.Name,
 	}, spaceBindingRequest)

diff --git a/controllers/spacerequest/spacerequest_controller.go b/controllers/spacerequest/spacerequest_controller.go
@@ -79,7 +79,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.
 	// Fetch the SpaceRequest
 	// search on all member clusters
 	spaceRequest := &toolchainv1alpha1.SpaceRequest{}
-	memberClusterWithSpaceRequest, found, err := cluster.LookupMember(r.MemberClusters, types.NamespacedName{
+	memberClusterWithSpaceRequest, found, err := cluster.LookupMember(ctx, r.MemberClusters, types.NamespacedName{
 		Namespace: request.Namespace,
 		Name:      request.Name,
 	}, spaceRequest)

diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
@@ -27,12 +27,12 @@ type Cluster struct {
 // returns memberCluster/false/error in case the Object was NOT found on any of the given member clusters and there was an error while trying to read one or more of the memberclusters
 //
 // CAVEAT: if the object was not found and there is an error reading from more than one member cluster, only the last read error will be returned.
-func LookupMember(memberClusters map[string]Cluster, namespacedName types.NamespacedName, object runtimeclient.Object) (Cluster, bool, error) {
+func LookupMember(ctx context.Context, memberClusters map[string]Cluster, namespacedName types.NamespacedName, object runtimeclient.Object) (Cluster, bool, error) {
 	var memberClusterWithObject Cluster
 	var getError error
 	var found bool
 	for _, memberCluster := range memberClusters {
-		err := memberCluster.Client.Get(context.TODO(), namespacedName, object)
+		err := memberCluster.Client.Get(ctx, namespacedName, object)
 		if err != nil {
 			if !errors.IsNotFound(err) {
 				// Error reading the object