karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove managed label in collected endpointslice and derived service 

Signed-off-by: changzhen <changzhen5@huawei.com>
This commit is contained in:
changzhen 2024-07-06 17:35:15 +08:00
parent c8acebc295
commit 9aee02019d
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/controllers/mcs/endpointslice_controller.go
View File

@ -161,7 +161,6 @@ func (c *EndpointSliceController) collectEndpointSliceFromWork(work *workv1alpha
desiredEndpointSlice.Labels = util.DedupeAndMergeLabels(desiredEndpointSlice.Labels, map[string]string{ desiredEndpointSlice.Labels = util.DedupeAndMergeLabels(desiredEndpointSlice.Labels, map[string]string{
workv1alpha2.WorkPermanentIDLabel: work.Labels[workv1alpha2.WorkPermanentIDLabel], workv1alpha2.WorkPermanentIDLabel: work.Labels[workv1alpha2.WorkPermanentIDLabel],
discoveryv1.LabelServiceName: names.GenerateDerivedServiceName(work.Labels[util.ServiceNameLabel]), discoveryv1.LabelServiceName: names.GenerateDerivedServiceName(work.Labels[util.ServiceNameLabel]),
util.ManagedByKarmadaLabel: util.ManagedByKarmadaLabelValue,
}) })
desiredEndpointSlice.Annotations = util.DedupeAndMergeAnnotations(desiredEndpointSlice.Annotations, map[string]string{ desiredEndpointSlice.Annotations = util.DedupeAndMergeAnnotations(desiredEndpointSlice.Annotations, map[string]string{
workv1alpha2.WorkNamespaceAnnotation: work.Namespace, workv1alpha2.WorkNamespaceAnnotation: work.Namespace,

4
pkg/controllers/mcs/service_import_controller.go
View File

@ -31,7 +31,6 @@ import (
mcsv1alpha1 "sigs.k8s.io/mcs-api/pkg/apis/v1alpha1" mcsv1alpha1 "sigs.k8s.io/mcs-api/pkg/apis/v1alpha1"
"github.com/karmada-io/karmada/pkg/events" "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/helper"
"github.com/karmada-io/karmada/pkg/util/names" "github.com/karmada-io/karmada/pkg/util/names"
) )
@ -104,9 +103,6 @@ func (c *ServiceImportController) deriveServiceFromServiceImport(svcImport *mcsv
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Namespace: svcImport.Namespace, Namespace: svcImport.Namespace,
Name: names.GenerateDerivedServiceName(svcImport.Name), Name: names.GenerateDerivedServiceName(svcImport.Name),
Labels: map[string]string{
util.ManagedByKarmadaLabel: util.ManagedByKarmadaLabelValue,
},
}, },
Spec: corev1.ServiceSpec{ Spec: corev1.ServiceSpec{
Type: corev1.ServiceTypeClusterIP, Type: corev1.ServiceTypeClusterIP,