Merge pull request #8062 from sbueringer/pr-fix-panic-clustercache

k8s-ci-robot · web-flow · commit c9dec3171661 · 2023-02-06T01:51:01.000-08:00
🐛 ClusterCacheTracker: fix panic in error creation
diff --git a/controllers/remote/cluster_cache_tracker.go b/controllers/remote/cluster_cache_tracker.go
@@ -445,7 +445,7 @@ func (t *ClusterCacheTracker) Watch(ctx context.Context, input WatchInput) error
 	// We have to lock the cluster, so that the watch is not created multiple times in parallel.
 	ok := t.clusterLock.TryLock(input.Cluster)
 	if !ok {
-		return errors.Wrapf(ErrClusterLocked, "failed to add %s watch on cluster %s: failed to get lock for cluster", input.Kind, klog.KRef(input.Cluster.Namespace, input.Cluster.Name))
+		return errors.Wrapf(ErrClusterLocked, "failed to add %T watch on cluster %s: failed to get lock for cluster", input.Kind, klog.KRef(input.Cluster.Namespace, input.Cluster.Name))
 	}
 	defer t.clusterLock.Unlock(input.Cluster)
 

Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ func (t *ClusterCacheTracker) Watch(ctx context.Context, input WatchInput) error`
`445`	`445`	`// We have to lock the cluster, so that the watch is not created multiple times in parallel.`
`446`	`446`	`ok := t.clusterLock.TryLock(input.Cluster)`
`447`	`447`	`if !ok {`
`448`		`- return errors.Wrapf(ErrClusterLocked, "failed to add %s watch on cluster %s: failed to get lock for cluster", input.Kind, klog.KRef(input.Cluster.Namespace, input.Cluster.Name))`
	`448`	`+ return errors.Wrapf(ErrClusterLocked, "failed to add %T watch on cluster %s: failed to get lock for cluster", input.Kind, klog.KRef(input.Cluster.Namespace, input.Cluster.Name))`
`449`	`449`	`}`
`450`	`450`	`defer t.clusterLock.Unlock(input.Cluster)`
`451`	`451`