fix labels and annotations leaking into kcp workspaces for related resources

On-behalf-of: @SAP [email protected]

Author: xrstf

internal/controller/syncmanager/lifecycle/cluster.go

@@ -29,6 +29,7 @@ import (
 
 	kcpdevcorev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
 
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"
@@ -135,6 +136,10 @@ func NewCluster(address string, baseRestConfig *rest.Config) (*Cluster, error) {
 
 	scheme := runtime.NewScheme()
 
+	if err := corev1.AddToScheme(scheme); err != nil {
+		return nil, fmt.Errorf("failed to register scheme %s: %w", corev1.SchemeGroupVersion, err)
+	}
+
 	if err := kcpdevcorev1alpha1.AddToScheme(scheme); err != nil {
 		return nil, fmt.Errorf("failed to register scheme %s: %w", kcpdevcorev1alpha1.SchemeGroupVersion, err)
 	}

internal/sync/metadata.go

@@ -94,7 +94,16 @@ var unsyncableLabels = sets.New(
 
 // filterUnsyncableLabels removes all unwanted remote labels and returns a new label set.
 func filterUnsyncableLabels(original labels.Set) labels.Set {
-	return filterLabels(original, unsyncableLabels)
+	filtered := filterLabels(original, unsyncableLabels)
+
+	out := labels.Set{}
+	for k, v := range filtered {
+		if !strings.HasPrefix(k, "claimed.internal.apis.kcp.io/") {
+			out[k] = v
+		}
+	}
+
+	return out
 }
 
 // unsyncableAnnotations are annotations we never want to copy from the remote to local objects.

internal/sync/object_syncer.go

@@ -302,11 +302,13 @@ func (s *objectSyncer) ensureDestinationObject(log *zap.SugaredLogger, source, d
 
 	// remember the connection between the source and destination object
 	sourceObjKey := newObjectKey(source.object, source.clusterName, source.workspacePath)
-	ensureLabels(destObj, sourceObjKey.Labels())
-	ensureAnnotations(destObj, sourceObjKey.Annotations())
+	if s.metadataOnDestination {
+		ensureLabels(destObj, sourceObjKey.Labels())
+		ensureAnnotations(destObj, sourceObjKey.Annotations())
 
-	// remember what agent synced this object
-	s.labelWithAgent(destObj)
+		// remember what agent synced this object
+		s.labelWithAgent(destObj)
+	}
 
 	// finally, we can create the destination object
 	objectLog := log.With("dest-object", newObjectKey(destObj, dest.clusterName, logicalcluster.None))