Revert WithCancelCause changes

Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com>

Author: cnvergence

pkg/konnector/controllers/cluster/serviceexport/multinsinformer/informer.go

@@ -187,12 +187,12 @@ func (inf *DynamicMultiNamespaceInformer) enqueueServiceNamespace(obj any) {
 	}
 
 	logger.V(1).Info("starting dynamic informer", "namespace", sns.Status.Namespace)
-	ctx, cancel := context.WithCancelCause(context.Background())
+	ctx, cancel := context.WithCancel(context.Background()) //nolint:gosec
 
 	factory := dynamicinformer.NewFilteredDynamicSharedInformerFactory(inf.providerDynamicClient, time.Minute*30, sns.Status.Namespace, nil)
 	gvrInf := factory.ForResource(inf.gvr)
 	gvrInf.Lister() // to wire the GVR up in the informer factory
-	inf.namespaceCancel[name] = func() { cancel(nil) }
+	inf.namespaceCancel[name] = cancel
 	inf.namespaceInformers[name] = gvrInf
 
 	for _, h := range inf.handlers {

pkg/konnector/controllers/cluster/serviceexport/serviceexport_reconcile.go

@@ -319,7 +319,7 @@ func (r *reconciler) ensureControllerForSchema(ctx context.Context, export *kube
 	}
 
 	// Create a new context for this controller
-	ctxWithCancel, cancel := context.WithCancelCause(ctx)
+	ctxWithCancel, cancel := context.WithCancel(ctx) //nolint:gosec
 
 	consumerInf.Start(ctxWithCancel.Done())
 	providerInf.Start(ctxWithCancel)
@@ -338,7 +338,7 @@ func (r *reconciler) ensureControllerForSchema(ctx context.Context, export *kube
 
 	r.syncStore.Set(key, contextstore.SyncContext{
 		Generation: export.Generation,
-		Cancel:     func() { cancel(nil) },
+		Cancel:     cancel,
 	})
 
 	return nil
@@ -474,7 +474,7 @@ func (r *reconciler) ensureControllerForPermissionClaim(
 
 	logger.Info("creating claim reconciler", "gvr", claimGVR, "key", claimKey)
 
-	ctxWithCancel, cancel := context.WithCancelCause(ctx)
+	ctxWithCancel, cancel := context.WithCancel(ctx) //nolint:gosec
 	// Start the informers and controllers in a goroutine
 	go func() {
 		defer r.syncStore.Delete(claimKey)
@@ -502,7 +502,7 @@ func (r *reconciler) ensureControllerForPermissionClaim(
 	// Store the controller context for tracking
 	r.syncStore.Set(claimKey, contextstore.SyncContext{
 		Generation: binding.Generation,
-		Cancel:     func() { cancel(nil) },
+		Cancel:     cancel,
 	})
 
 	return nil

pkg/konnector/konnector_reconcile.go

@@ -127,10 +127,10 @@ func (r *reconciler) startClusterControllerForSecret(ctx context.Context, secret
 	// will also handle real APIServiceBindings that use the same kubeconfig.
 	syntheticKey := "__heartbeat__" + secret.Name
 
-	ctrlCtx, cancel := context.WithCancelCause(ctx)
+	ctrlCtx, cancel := context.WithCancel(ctx)
 	ctrlContext := &controllerContext{
 		kubeconfig:      kubeconfig,
-		cancel:          func() { cancel(nil) },
+		cancel:          cancel,
 		serviceBindings: sets.New(syntheticKey),
 	}
 	r.controllers[syntheticKey] = ctrlContext
@@ -154,7 +154,7 @@ func (r *reconciler) startClusterControllerForSecret(ctx context.Context, secret
 	)
 	if err != nil {
 		logger.Error(err, "failed to start cluster controller for heartbeat")
-		cancel(nil)
+		cancel()
 		delete(r.controllers, syntheticKey)
 		return err
 	}
@@ -239,10 +239,10 @@ func (r *reconciler) reconcile(ctx context.Context, binding *kubebindv1alpha2.AP
 		return nil // nothing we can do here. The APIServiceBinding Controller will set a condition
 	}
 
-	ctrlCtx, cancel := context.WithCancelCause(ctx)
+	ctrlCtx, cancel := context.WithCancel(ctx) //nolint:gosec
 	r.controllers[binding.Name] = &controllerContext{
 		kubeconfig:      kubeconfig,
-		cancel:          func() { cancel(nil) },
+		cancel:          cancel,
 		serviceBindings: sets.New(binding.Name),
 	}