Remove UID-based chunk label/selector usage and replace with chunkLister utilities

Author: wzshiming

pkg/controller/bearer_controller.go

@@ -27,7 +27,6 @@ import (
 
 const (
 	BearerNameAnnotationKey = v1alpha1.GroupName + "/bearer-name"
-	BearerUIDLabelKey       = v1alpha1.GroupName + "/bearer-uid"
 )
 
 type BearerController struct {

pkg/controller/bearer_to_chunk_controller.go

@@ -30,7 +30,6 @@ import (
 	"github.com/OpenCIDN/cidn/pkg/internal/utils"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
 	"k8s.io/klog/v2"
@@ -109,11 +108,8 @@ func (c *BearerToChunkController) runWorker(ctx context.Context) {
 }
 
 func (c *BearerToChunkController) cleanupBearer(bearer *v1alpha1.Bearer) {
-	err := c.client.TaskV1alpha1().Chunks().DeleteCollection(context.Background(), metav1.DeleteOptions{}, metav1.ListOptions{
-		LabelSelector: labels.Set{
-			BearerUIDLabelKey: string(bearer.UID),
-		}.String(),
-	})
+	chunkName := buildBearerChunkName(bearer.Name)
+	err := c.client.TaskV1alpha1().Chunks().Delete(context.Background(), chunkName, metav1.DeleteOptions{})
 	if err != nil {
 		klog.Errorf("failed to delete chunks for bearer %s: %v", bearer.Name, err)
 	}
@@ -185,21 +181,11 @@ func (c *BearerToChunkController) toChunk(ctx context.Context, bearer *v1alpha1.
 
 	chunk := &v1alpha1.Chunk{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: chunkName,
-			Labels: map[string]string{
-				BearerUIDLabelKey: string(bearer.UID),
-			},
+			Name:   chunkName,
+			Labels: map[string]string{},
 			Annotations: map[string]string{
 				BearerNameAnnotationKey: bearer.Name,
 			},
-			OwnerReferences: []metav1.OwnerReference{
-				{
-					APIVersion: v1alpha1.GroupVersion.String(),
-					Kind:       v1alpha1.BearerKind,
-					Name:       bearer.Name,
-					UID:        bearer.UID,
-				},
-			},
 		},
 		Spec: v1alpha1.ChunkSpec{
 			Priority:           bearer.Spec.Priority + 1,

pkg/controller/blob_controller.go

@@ -20,14 +20,16 @@ import (
 	"context"
 
 	"github.com/OpenCIDN/cidn/pkg/apis/task/v1alpha1"
+	taskv1alpha1 "github.com/OpenCIDN/cidn/pkg/apis/task/v1alpha1"
 	"github.com/OpenCIDN/cidn/pkg/clientset/versioned"
 	"github.com/OpenCIDN/cidn/pkg/informers/externalversions"
+	"github.com/OpenCIDN/cidn/pkg/internal/utils"
 	"github.com/wzshiming/sss"
+	"k8s.io/client-go/tools/cache"
 )
 
 const (
 	BlobNameAnnotationKey = v1alpha1.GroupName + "/blob-name"
-	BlobUIDLabelKey       = v1alpha1.GroupName + "/blob-uid"
 )
 
 type BlobController struct {
@@ -89,3 +91,7 @@ func (c *BlobController) Start(ctx context.Context) error {
 
 	return nil
 }
+
+func chunkLister(index cache.Indexer) utils.ResourceIndexer[*taskv1alpha1.Chunk] {
+	return utils.NewResourceIndexer[*taskv1alpha1.Chunk](index, taskv1alpha1.Resource("chunk"), "")
+}

pkg/controller/blob_from_chunk_controller.go

@@ -372,9 +372,11 @@ func (c *BlobFromChunkController) fromChunks(ctx context.Context, blob *v1alpha1
 
 	mp = mp.DeepCopy()
 
-	chunks, err := c.chunkInformer.Lister().List(labels.SelectorFromSet(labels.Set{
-		BlobUIDLabelKey: string(blob.UID),
-	}))
+	chunks, err := chunkLister(c.chunkInformer.Informer().GetIndexer()).List(
+		labels.Everything(),
+		labels.SelectorFromSet(labels.Set{
+			BlobNameAnnotationKey: blob.Name,
+		}))
 	if err != nil {
 		return fmt.Errorf("failed to list chunks: %w", err)
 	}
@@ -614,9 +616,11 @@ func verifyDestinationSha256(ctx context.Context, s3 *sss.SSS, dst *v1alpha1.Blo
 // deleteChunksInNonFinalStates deletes chunks that are in Running, Pending, or Unknown states
 // when a blob fails. This ensures cleanup of incomplete work when a blob cannot be completed.
 func (c *BlobFromChunkController) deleteChunksInNonFinalStates(ctx context.Context, blob *v1alpha1.Blob) {
-	chunks, err := c.chunkInformer.Lister().List(labels.SelectorFromSet(labels.Set{
-		BlobUIDLabelKey: string(blob.UID),
-	}))
+	chunks, err := chunkLister(c.chunkInformer.Informer().GetIndexer()).List(
+		labels.Everything(),
+		labels.SelectorFromSet(labels.Set{
+			BlobNameAnnotationKey: blob.Name,
+		}))
 	if err != nil {
 		klog.Errorf("failed to list chunks for blob %s during cleanup: %v", blob.Name, err)
 		return