fix: delete kusionstack.io/cluster label if object is Unstructured

Author: zoumo

multicluster/help.go

@@ -22,6 +22,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"kusionstack.io/kube-utils/multicluster/clusterinfo"
 )
@@ -55,12 +56,14 @@ func getCluster(ctx context.Context, label map[string]string) (cluster string, e
 	return
 }
 
-func getThenDeleteCluster(ctx context.Context, label map[string]string) (cluster string, err error) {
-	cluster, err = getCluster(ctx, label)
+func getThenDeleteCluster(ctx context.Context, obj client.Object) (cluster string, err error) {
+	labels := obj.GetLabels()
+	cluster, err = getCluster(ctx, labels)
 	if err != nil {
 		return
 	}
-	delete(label, clusterinfo.ClusterLabelKey)
+	delete(labels, clusterinfo.ClusterLabelKey)
+	obj.SetLabels(labels)
 	return
 }
 

multicluster/multi_cluster_client.go

@@ -127,7 +127,7 @@ func (mcc *multiClusterClient) Create(ctx context.Context, obj client.Object, op
 	}()
 
 	// Get cluster info from context or labels, and delete it from labels because we should not write it into apiserver
-	cluster, err = getThenDeleteCluster(ctx, obj.GetLabels())
+	cluster, err = getThenDeleteCluster(ctx, obj)
 	if err != nil {
 		metrics.NewInvalidClusterCounterMetrics("Create", cluster)
 		mcc.log.Error(err, "failed to get cluster")
@@ -309,7 +309,7 @@ func (mcc *multiClusterClient) Patch(ctx context.Context, obj client.Object, pat
 	}()
 
 	// Get cluster info from context or labels, and delete it from labels because we should not write it into apiserver
-	cluster, err = getThenDeleteCluster(ctx, obj.GetLabels())
+	cluster, err = getThenDeleteCluster(ctx, obj)
 	if err != nil {
 		metrics.NewInvalidClusterCounterMetrics("Patch", cluster)
 		mcc.log.Error(err, "failed to get cluster")
@@ -339,7 +339,7 @@ func (mcc *multiClusterClient) Update(ctx context.Context, obj client.Object, op
 	}()
 
 	// Get cluster info from context or labels, and delete it from labels because we should not write it into apiserver
-	cluster, err = getThenDeleteCluster(ctx, obj.GetLabels())
+	cluster, err = getThenDeleteCluster(ctx, obj)
 	if err != nil {
 		metrics.NewInvalidClusterCounterMetrics("Update", cluster)
 		mcc.log.Error(err, "failed to get cluster")
@@ -392,7 +392,7 @@ func (sw *statusWriter) Update(ctx context.Context, obj client.Object, opts ...c
 	}()
 
 	// Get cluster info from context or labels, and delete it from labels because we should not write it into apiserver
-	cluster, err = getThenDeleteCluster(ctx, obj.GetLabels())
+	cluster, err = getThenDeleteCluster(ctx, obj)
 	if err != nil {
 		metrics.NewInvalidClusterCounterMetrics("StatusUpdate", cluster)
 		sw.log.Error(err, "failed to get cluster")
@@ -419,7 +419,7 @@ func (sw *statusWriter) Patch(ctx context.Context, obj client.Object, patch clie
 	}()
 
 	// Get cluster info from context or labels, and delete it from labels because we should not write it into apiserver
-	cluster, err = getThenDeleteCluster(ctx, obj.GetLabels())
+	cluster, err = getThenDeleteCluster(ctx, obj)
 	if err != nil {
 		metrics.NewInvalidClusterCounterMetrics("StatusPatch", cluster)
 		sw.log.Error(err, "failed to get cluster")