Skip to content

Commit

Permalink
Merge pull request #5147 from XiShanYongYe-Chang/remove-managed-label…
Browse files Browse the repository at this point in the history
…-in-collected-eps

Remove managed label in collected endpointslice and derived service
  • Loading branch information
karmada-bot committed Jul 8, 2024
2 parents 4c70d67 + 9aee020 commit 25f9fdd
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 5 deletions.
1 change: 0 additions & 1 deletion pkg/controllers/mcs/endpointslice_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,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,
Expand Down
4 changes: 0 additions & 4 deletions pkg/controllers/mcs/service_import_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 25f9fdd

Please sign in to comment.