From 9aee02019d9c6339408c394cee2304d6e6f85b60 Mon Sep 17 00:00:00 2001 From: changzhen Date: Sat, 6 Jul 2024 17:35:15 +0800 Subject: [PATCH] remove managed label in collected endpointslice and derived service Signed-off-by: changzhen --- pkg/controllers/mcs/endpointslice_controller.go | 1 - pkg/controllers/mcs/service_import_controller.go | 4 ---- 2 files changed, 5 deletions(-) diff --git a/pkg/controllers/mcs/endpointslice_controller.go b/pkg/controllers/mcs/endpointslice_controller.go index b0add1f9c..fabd1adab 100644 --- a/pkg/controllers/mcs/endpointslice_controller.go +++ b/pkg/controllers/mcs/endpointslice_controller.go @@ -161,7 +161,6 @@ func (c *EndpointSliceController) collectEndpointSliceFromWork(work *workv1alpha desiredEndpointSlice.Labels = util.DedupeAndMergeLabels(desiredEndpointSlice.Labels, map[string]string{ workv1alpha2.WorkPermanentIDLabel: work.Labels[workv1alpha2.WorkPermanentIDLabel], discoveryv1.LabelServiceName: names.GenerateDerivedServiceName(work.Labels[util.ServiceNameLabel]), - util.ManagedByKarmadaLabel: util.ManagedByKarmadaLabelValue, }) desiredEndpointSlice.Annotations = util.DedupeAndMergeAnnotations(desiredEndpointSlice.Annotations, map[string]string{ workv1alpha2.WorkNamespaceAnnotation: work.Namespace, diff --git a/pkg/controllers/mcs/service_import_controller.go b/pkg/controllers/mcs/service_import_controller.go index 2acb71f62..cde4cbe41 100644 --- a/pkg/controllers/mcs/service_import_controller.go +++ b/pkg/controllers/mcs/service_import_controller.go @@ -31,7 +31,6 @@ import ( mcsv1alpha1 "sigs.k8s.io/mcs-api/pkg/apis/v1alpha1" "github.com/karmada-io/karmada/pkg/events" - "github.com/karmada-io/karmada/pkg/util" "github.com/karmada-io/karmada/pkg/util/helper" "github.com/karmada-io/karmada/pkg/util/names" ) @@ -104,9 +103,6 @@ func (c *ServiceImportController) deriveServiceFromServiceImport(svcImport *mcsv ObjectMeta: metav1.ObjectMeta{ Namespace: svcImport.Namespace, Name: names.GenerateDerivedServiceName(svcImport.Name), - Labels: map[string]string{ - util.ManagedByKarmadaLabel: util.ManagedByKarmadaLabelValue, - }, }, Spec: corev1.ServiceSpec{ Type: corev1.ServiceTypeClusterIP,