From f77ebbd87844705357d2a1956f0e545383177301 Mon Sep 17 00:00:00 2001
From: Lan Luo <luola@vmware.com>
Date: Thu, 9 Jun 2022 10:53:44 +0800
Subject: [PATCH] Use Service ClusterIPs as MC Service's Endpoints

1. Use Service ClusterIPs instead of Pod IPs as MC Service's Endpoints.
The ServiceExport controller will only watch ServiceExport and
Service events, and wrap Service's ClusterIPs into a new Endpoint kind of
ResourceExport.
2. Includes local Serivce ClusterIP as multi-cluster Service's Endpoints as well.

Signed-off-by: Lan Luo <luola@vmware.com>
---
 build/charts/antrea/README.md                 |   2 +-
 build/charts/antrea/values.yaml               |   2 +-
 ci/jenkins/test-mc.sh                         |  52 ++++++--
 .../controllers/multicluster/common/helper.go |  26 ++++
 .../commonarea/resourceimport_controller.go   |  41 +-----
 .../resourceimport_controller_test.go         |  26 ++--
 .../multicluster/serviceexport_controller.go  | 125 +++---------------
 .../serviceexport_controller_test.go          |  41 +-----
 multicluster/hack/mc-integration-test.sh      |   6 +-
 multicluster/test/e2e/service_test.go         |   6 +-
 multicluster/test/integration/README.md       |   2 +-
 .../resourceexport_controller_test.go         |   2 +-
 .../serviceexport_controller_test.go          |  85 +++---------
 multicluster/test/integration/test_data.go    |   4 -
 14 files changed, 136 insertions(+), 284 deletions(-)

diff --git a/build/charts/antrea/README.md b/build/charts/antrea/README.md
index c6e9b828cbc..2124c8b075f 100644
--- a/build/charts/antrea/README.md
+++ b/build/charts/antrea/README.md
@@ -83,7 +83,7 @@ Kubernetes: `>= 1.16.0-0`
 | multicast.igmpQueryInterval | string | `"125s"` | The interval at which the antrea-agent sends IGMP queries to Pods. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". |
 | multicast.multicastInterfaces | list | `[]` | Names of the interfaces on Nodes that are used to forward multicast traffic. |
 | multicluster.enable | bool | `false` | Enable Antrea Multi-cluster Gateway to support cross-cluster traffic. This feature is supported only with encap mode. |
-| multicluster.namespace | string | `""` | The Namespace where Antrea Multi-cluster Controller is running. The default is Antrea Agent Namespace if it's empty. |
+| multicluster.namespace | string | `""` | The Namespace where Antrea Multi-cluster Controller is running. The default is antrea-agent's Namespace. |
 | noSNAT | bool | `false` | Whether or not to SNAT (using the Node IP) the egress traffic from a Pod to the external network. |
 | nodeIPAM.clusterCIDRs | list | `[]` | CIDR ranges to use when allocating Pod IP addresses. |
 | nodeIPAM.enable | bool | `false` | Enable Node IPAM in Antrea |
diff --git a/build/charts/antrea/values.yaml b/build/charts/antrea/values.yaml
index 759b8b2232c..32bd2739fae 100644
--- a/build/charts/antrea/values.yaml
+++ b/build/charts/antrea/values.yaml
@@ -287,7 +287,7 @@ multicluster:
   # This feature is supported only with encap mode.
   enable: false
   # -- The Namespace where Antrea Multi-cluster Controller is running.
-  # The default is Antrea Agent Namespace if it's empty.
+  # The default is antrea-agent's Namespace.
   namespace: ""
 
 testing:
diff --git a/ci/jenkins/test-mc.sh b/ci/jenkins/test-mc.sh
index 3e209e5f5bd..21e34824b02 100755
--- a/ci/jenkins/test-mc.sh
+++ b/ci/jenkins/test-mc.sh
@@ -33,8 +33,7 @@ LEADER_CLUSTER_CONFIG="--kubeconfig=$MULTICLUSTER_KUBECONFIG_PATH/leader"
 EAST_CLUSTER_CONFIG="--kubeconfig=$MULTICLUSTER_KUBECONFIG_PATH/east"
 WEST_CLUSTER_CONFIG="--kubeconfig=$MULTICLUSTER_KUBECONFIG_PATH/west"
 ENABLE_MC_GATEWAY=false
-
-CONTROL_PLANE_NODE_ROLE="control-plane,master"
+IS_CONTAINERD=false
 
 multicluster_kubeconfigs=($EAST_CLUSTER_CONFIG $LEADER_CLUSTER_CONFIG $WEST_CLUSTER_CONFIG)
 membercluster_kubeconfigs=($EAST_CLUSTER_CONFIG $WEST_CLUSTER_CONFIG)
@@ -160,6 +159,7 @@ function wait_for_antrea_multicluster_pods_ready {
 }
 
 function wait_for_multicluster_controller_ready {
+    echo "====== Deploying Antrea Multicluster Leader Cluster with ${LEADER_CLUSTER_CONFIG} ======"
     kubectl create ns antrea-mcs-ns  "${LEADER_CLUSTER_CONFIG}" || true
     kubectl apply -f ./multicluster/test/yamls/manifest.yml "${LEADER_CLUSTER_CONFIG}"
     kubectl apply -f ./multicluster/build/yamls/antrea-multicluster-leader-global.yml "${LEADER_CLUSTER_CONFIG}"
@@ -175,15 +175,17 @@ function wait_for_multicluster_controller_ready {
     sed -i '/creationTimestamp/d' ./multicluster/test/yamls/leader-access-token.yml
     sed -i 's/antrea-multicluster-member-access-sa/antrea-multicluster-controller/g' ./multicluster/test/yamls/leader-access-token.yml
     sed -i 's/antrea-mcs-ns/kube-system/g' ./multicluster/test/yamls/leader-access-token.yml
-    echo "type: Opaque" >>./multicluster/test/yamls/leader-access-token.yml
+    echo "type: Opaque" >> ./multicluster/test/yamls/leader-access-token.yml
 
     for config in "${membercluster_kubeconfigs[@]}";
     do
+        echo "====== Deploying Antrea Multicluster Member Cluster with ${config} ======"
         kubectl apply -f ./multicluster/build/yamls/antrea-multicluster-member.yml ${config}
         kubectl rollout status deployment/antrea-mc-controller -n kube-system ${config}
         kubectl apply -f ./multicluster/test/yamls/leader-access-token.yml ${config}
     done
 
+    echo "====== ClusterSet Initialization in Leader and Member Clusters ======"
     kubectl apply -f ./multicluster/test/yamls/east-member-cluster.yml "${EAST_CLUSTER_CONFIG}"
     kubectl apply -f ./multicluster/test/yamls/west-member-cluster.yml "${WEST_CLUSTER_CONFIG}"
     kubectl apply -f ./multicluster/test/yamls/clusterset.yml "${LEADER_CLUSTER_CONFIG}"
@@ -213,7 +215,11 @@ function deliver_antrea_multicluster {
     do
        kubectl get nodes -o wide --no-headers=true ${kubeconfig}| awk '{print $6}' | while read IP; do
             rsync -avr --progress --inplace -e "ssh -o StrictHostKeyChecking=no" "${WORKDIR}"/antrea-ubuntu.tar jenkins@[${IP}]:${WORKDIR}/antrea-ubuntu.tar
-            ssh -o StrictHostKeyChecking=no -n jenkins@${IP} "${CLEAN_STALE_IMAGES}; docker load -i ${WORKDIR}/antrea-ubuntu.tar" || true
+            if [[ ${IS_CONTAINERD} ]];then
+              ssh -o StrictHostKeyChecking=no -n jenkins@${IP} "${CLEAN_STALE_IMAGES}; sudo ctr -n=k8s.io images import ${WORKDIR}/antrea-ubuntu.tar" || true
+            else
+              ssh -o StrictHostKeyChecking=no -n jenkins@${IP} "${CLEAN_STALE_IMAGES}; docker load -i ${WORKDIR}/antrea-ubuntu.tar" || true
+            fi
        done
     done
 }
@@ -232,13 +238,17 @@ function deliver_multicluster_controller {
 
     for kubeconfig in "${multicluster_kubeconfigs[@]}"
     do
-        kubectl get nodes -o wide --no-headers=true "${kubeconfig}"| awk '{print $6}' | while read IP; do
+        kubectl get nodes -o wide --no-headers=true "${kubeconfig}" | awk '{print $6}' | while read IP; do
             rsync -avr --progress --inplace -e "ssh -o StrictHostKeyChecking=no" "${WORKDIR}"/antrea-mcs.tar jenkins@[${IP}]:${WORKDIR}/antrea-mcs.tar
-            ssh -o StrictHostKeyChecking=no -n jenkins@"${IP}" "${CLEAN_STALE_IMAGES}; docker load -i ${WORKDIR}/antrea-mcs.tar" || true
+            if [[ ${IS_CONTAINERD} ]];then
+              ssh -o StrictHostKeyChecking=no -n jenkins@"${IP}" "${CLEAN_STALE_IMAGES}; sudo ctr -n=k8s.io images import ${WORKDIR}/antrea-mcs.tar" || true
+            else
+              ssh -o StrictHostKeyChecking=no -n jenkins@"${IP}" "${CLEAN_STALE_IMAGES}; docker load -i ${WORKDIR}/antrea-mcs.tar" || true
+            fi
         done
     done
 
-    leader_ip=$(kubectl get nodes -o wide --no-headers=true ${LEADER_CLUSTER_CONFIG} | awk -v role="$CONTROL_PLANE_NODE_ROLE" '$3 == role {print $6}')
+    leader_ip=$(kubectl get nodes -o wide --no-headers=true ${LEADER_CLUSTER_CONFIG} | awk -v role1="master" -v role2="control-plane" '($3 ~ role1 || $3 ~ role2) {print $6}')
     sed -i "s|<LEADER_CLUSTER_IP>|${leader_ip}|" ./multicluster/test/yamls/east-member-cluster.yml
     sed -i "s|<LEADER_CLUSTER_IP>|${leader_ip}|" ./multicluster/test/yamls/west-member-cluster.yml
     rsync -avr --progress --inplace -e "ssh -o StrictHostKeyChecking=no" ./multicluster/test/yamls/test-acnp-copy-span-ns-isolation.yml jenkins@["${leader_ip}"]:"${WORKDIR}"/test-acnp-copy-span-ns-isolation.yml
@@ -248,7 +258,7 @@ function deliver_multicluster_controller {
        # Remove the longest matched substring '*/' from a string like '--kubeconfig=/var/lib/jenkins/.kube/east'
        # to get the last element which is the cluster name.
        cluster=${kubeconfig##*/}
-       ip=$(kubectl get nodes -o wide --no-headers=true ${kubeconfig} | awk -v role="$CONTROL_PLANE_NODE_ROLE" '$3 == role {print $6}')
+       ip=$(kubectl get nodes -o wide --no-headers=true ${kubeconfig} | awk -v role1="master" -v role2="control-plane" '($3 ~ role1 || $3 ~ role2) {print $6}')
        rsync -avr --progress --inplace -e "ssh -o StrictHostKeyChecking=no" ./multicluster/test/yamls/test-${cluster}-serviceexport.yml jenkins@["${ip}"]:"${WORKDIR}"/serviceexport.yml
     done
 }
@@ -262,7 +272,14 @@ function run_multicluster_e2e {
     export PATH=$GOROOT/bin:$PATH
 
     if [[ ${ENABLE_MC_GATEWAY} ]]; then
-      sed -i.bak -E "s/#[[:space:]]*Multicluster[[:space:]]*:[[:space:]]*[a-z]+[[:space:]]*$/  Multicluster: true/" build/yamls/antrea.yml
+    cat > build/yamls/chart-values/antrea.yml <<EOF
+multicluster:
+  enable: true
+featureGates: {
+  Multicluster: true
+}
+EOF
+    make manifest
     fi
     wait_for_antrea_multicluster_pods_ready "${LEADER_CLUSTER_CONFIG}"
     wait_for_antrea_multicluster_pods_ready "${EAST_CLUSTER_CONFIG}"
@@ -281,10 +298,14 @@ function run_multicluster_e2e {
     do
         kubectl get nodes -o wide --no-headers=true "${kubeconfig}"| awk '{print $6}' | while read IP; do
             rsync -avr --progress --inplace -e "ssh -o StrictHostKeyChecking=no" "${WORKDIR}"/nginx.tar jenkins@["${IP}"]:"${WORKDIR}"/nginx.tar
-            ssh -o StrictHostKeyChecking=no -n jenkins@"${IP}" "${CLEAN_STALE_IMAGES}; docker load -i ${WORKDIR}/nginx.tar" || true
-
             rsync -avr --progress --inplace -e "ssh -o StrictHostKeyChecking=no" "${WORKDIR}"/agnhost.tar jenkins@["${IP}"]:"${WORKDIR}"/agnhost.tar
+        if [[ ${IS_CONTAINERD} ]];then
+            ssh -o StrictHostKeyChecking=no -n jenkins@"${IP}" "${CLEAN_STALE_IMAGES}; sudo ctr -n=k8s.io images import ${WORKDIR}/nginx.tar" || true
+            ssh -o StrictHostKeyChecking=no -n jenkins@"${IP}" "sudo ctr -n=k8s.io images import ${WORKDIR}/agnhost.tar" || true
+        else
+            ssh -o StrictHostKeyChecking=no -n jenkins@"${IP}" "${CLEAN_STALE_IMAGES}; docker load -i ${WORKDIR}/nginx.tar" || true
             ssh -o StrictHostKeyChecking=no -n jenkins@"${IP}" "docker load -i ${WORKDIR}/agnhost.tar" || true
+        fi
         done
 
     done
@@ -307,6 +328,15 @@ trap clean_multicluster EXIT
 clean_tmp
 clean_images
 
+# We assume all clusters in one testing ClusterSet are using the same runtime,
+# so check leader cluster only to set IS_CONTAINERD.
+set +e
+kubectl get nodes -o wide --no-headers=true ${LEADER_CLUSTER_CONFIG} | grep containerd
+if [[ $? -eq 0 ]];then
+    IS_CONTAINERD=true
+fi
+set -e
+
 if [[ ${TESTCASE} =~ "e2e" ]]; then
     deliver_antrea_multicluster
     deliver_multicluster_controller
diff --git a/multicluster/controllers/multicluster/common/helper.go b/multicluster/controllers/multicluster/common/helper.go
index ee7b9e9593b..b36a5c65f60 100644
--- a/multicluster/controllers/multicluster/common/helper.go
+++ b/multicluster/controllers/multicluster/common/helper.go
@@ -82,3 +82,29 @@ func FilterEndpointSubsets(subsets []corev1.EndpointSubset) []corev1.EndpointSub
 	}
 	return newSubsets
 }
+
+func GetServiceEndpointSubset(svc *corev1.Service) corev1.EndpointSubset {
+	var epSubset corev1.EndpointSubset
+	for _, ip := range svc.Spec.ClusterIPs {
+		epSubset.Addresses = append(epSubset.Addresses, corev1.EndpointAddress{IP: ip})
+	}
+
+	epSubset.Ports = GetServiceEndpointPorts(svc.Spec.Ports)
+	return epSubset
+}
+
+// GetServiceEndpointPorts converts Service's port to EndpointPort
+func GetServiceEndpointPorts(ports []corev1.ServicePort) []corev1.EndpointPort {
+	if len(ports) == 0 {
+		return nil
+	}
+	var epPorts []corev1.EndpointPort
+	for _, p := range ports {
+		epPorts = append(epPorts, corev1.EndpointPort{
+			Name:     p.Name,
+			Port:     p.Port,
+			Protocol: p.Protocol,
+		})
+	}
+	return epPorts
+}
diff --git a/multicluster/controllers/multicluster/commonarea/resourceimport_controller.go b/multicluster/controllers/multicluster/commonarea/resourceimport_controller.go
index fb4eabf79eb..e592523a50b 100644
--- a/multicluster/controllers/multicluster/commonarea/resourceimport_controller.go
+++ b/multicluster/controllers/multicluster/commonarea/resourceimport_controller.go
@@ -163,7 +163,7 @@ func (r *ResourceImportReconciler) handleResImpUpdateForService(ctx context.Cont
 	}
 	if !svcNotFound {
 		// Here we will skip creating derived MC Service when a Service with the same name
-		// already exists but it not previously created by Importer.
+		// already exists but it's not previously created by Importer.
 		if _, ok := svc.Annotations[common.AntreaMCServiceAnnotation]; !ok {
 			err := errors.New("the Service conflicts with existing one")
 			klog.ErrorS(err, "Unable to import Service", "service", klog.KObj(svc))
@@ -180,7 +180,7 @@ func (r *ResourceImportReconciler) handleResImpUpdateForService(ctx context.Cont
 		if err = r.localClusterClient.Get(ctx, svcName, svc); err != nil {
 			// Ignore the error here, and requeue the event again when both Service
 			// and ServiceImport are created later
-			klog.ErrorS(err, "Failed to get latest imported Service", "service", klog.KObj(svc))
+			klog.ErrorS(err, "Failed to get latest imported Service", "service", klog.KObj(svcObj))
 		}
 	}
 
@@ -285,19 +285,8 @@ func (r *ResourceImportReconciler) handleResImpUpdateForEndpoints(ctx context.Co
 			return ctrl.Result{}, err
 		}
 	}
-	// ResourceImport includes all Endpoints from exported Service.
-	// Need to remove any Endpoints from the local cluster.
-	var newSubsets []corev1.EndpointSubset
-	localEp := &corev1.Endpoints{}
-	err = r.localClusterClient.Get(ctx, types.NamespacedName{Namespace: resImp.Spec.Namespace, Name: resImp.Spec.Name}, localEp)
-	if err == nil {
-		newSubsets = removeLocalSubsets(localEp.Subsets, resImp.Spec.Endpoints.Subsets)
-	} else if apierrors.IsNotFound(err) {
-		newSubsets = resImp.Spec.Endpoints.Subsets
-	} else {
-		klog.ErrorS(err, "Failed to get local Endpoint", "endpoint", epNamespaced.String())
-		return ctrl.Result{}, err
-	}
+
+	newSubsets := resImp.Spec.Endpoints.Subsets
 	mcsEpObj := &corev1.Endpoints{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:        epName,
@@ -389,28 +378,6 @@ func getMCServiceImport(resImp *multiclusterv1alpha1.ResourceImport, clusterID s
 	return svcImp
 }
 
-func removeLocalSubsets(local []corev1.EndpointSubset, allSubsets []corev1.EndpointSubset) []corev1.EndpointSubset {
-	filteredLocal := common.FilterEndpointSubsets(local)
-	size := len(allSubsets)
-	if size < 1 {
-		return allSubsets
-	}
-	newSubsets := make([]corev1.EndpointSubset, size)
-	copy(newSubsets, allSubsets)
-	lastIdx := size - 1
-	for n, r := range newSubsets {
-		for _, l := range filteredLocal {
-			if apiequality.Semantic.DeepEqual(r, l) {
-				newSubsets[n] = newSubsets[lastIdx]
-				newSubsets[lastIdx] = corev1.EndpointSubset{}
-				newSubsets = newSubsets[:lastIdx]
-				break
-			}
-		}
-	}
-	return newSubsets
-}
-
 func addAnnotation(svcImport *k8smcsv1alpha1.ServiceImport, localClusterID string) {
 	if svcImport.Annotations == nil {
 		svcImport.Annotations = make(map[string]string)
diff --git a/multicluster/controllers/multicluster/commonarea/resourceimport_controller_test.go b/multicluster/controllers/multicluster/commonarea/resourceimport_controller_test.go
index d9f0bb2528f..0da80326d69 100644
--- a/multicluster/controllers/multicluster/commonarea/resourceimport_controller_test.go
+++ b/multicluster/controllers/multicluster/commonarea/resourceimport_controller_test.go
@@ -342,12 +342,22 @@ func TestResourceImportReconciler_handleUpdateEvent(t *testing.T) {
 	}
 	newSubsets := []corev1.EndpointSubset{subSetA, subSetB}
 
-	existEp := &corev1.Endpoints{
+	existSvc := &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: "default",
 			Name:      "nginx",
 		},
-		Subsets: []corev1.EndpointSubset{subSetB},
+		Spec: corev1.ServiceSpec{
+			Ports: []corev1.ServicePort{
+				{
+					Name:     "http",
+					Protocol: corev1.ProtocolTCP,
+					Port:     8080,
+				},
+			},
+			ClusterIP:  "10.10.11.13",
+			ClusterIPs: []string{"10.10.11.13"},
+		},
 	}
 
 	svcWithoutAutoAnnotation := &corev1.Service{
@@ -392,7 +402,7 @@ func TestResourceImportReconciler_handleUpdateEvent(t *testing.T) {
 	epResImportWithConflicts.Spec.Namespace = "kube-system"
 
 	fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(existMCSvc, existMCEp, existSvcImp,
-		existEp, existMCSvcConflicts, existMCEpConflicts, svcWithoutAutoAnnotation, epWithoutAutoAnnotation).Build()
+		existSvc, existMCSvcConflicts, existMCEpConflicts, svcWithoutAutoAnnotation, epWithoutAutoAnnotation).Build()
 	fakeRemoteClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(updatedEpResImport, updatedSvcResImport,
 		svcResImportWithConflicts, epResImportWithConflicts).Build()
 	remoteCluster := NewFakeRemoteCommonArea(scheme, remoteMgr, fakeRemoteClient, "leader-cluster", "default")
@@ -407,7 +417,7 @@ func TestResourceImportReconciler_handleUpdateEvent(t *testing.T) {
 		expectedErr      bool
 	}{
 		{
-			name:             "update service",
+			name:             "update Service",
 			objType:          "Service",
 			req:              svcImportReq,
 			resNamespaceName: types.NamespacedName{Namespace: "default", Name: "antrea-mc-nginx"},
@@ -420,14 +430,14 @@ func TestResourceImportReconciler_handleUpdateEvent(t *testing.T) {
 			},
 		},
 		{
-			name:             "update endpoints",
+			name:             "update Endpoints",
 			objType:          "Endpoints",
 			req:              epImportReq,
 			resNamespaceName: types.NamespacedName{Namespace: "default", Name: "antrea-mc-nginx"},
-			expectedSubset:   []corev1.EndpointSubset{subSetA},
+			expectedSubset:   newSubsets,
 		},
 		{
-			name:    "skip update a service without mcs annotation",
+			name:    "skip update a Service without mcs annotation",
 			objType: "Service",
 			req: ctrl.Request{NamespacedName: types.NamespacedName{
 				Namespace: leaderNamespace,
@@ -437,7 +447,7 @@ func TestResourceImportReconciler_handleUpdateEvent(t *testing.T) {
 			expectedErr:      true,
 		},
 		{
-			name:    "skip update an endpoint without mcs annotation",
+			name:    "skip update an Endpoint without mcs annotation",
 			objType: "Endpoints",
 			req: ctrl.Request{NamespacedName: types.NamespacedName{
 				Namespace: leaderNamespace,
diff --git a/multicluster/controllers/multicluster/serviceexport_controller.go b/multicluster/controllers/multicluster/serviceexport_controller.go
index 06f16d28a37..b42c59db7f2 100644
--- a/multicluster/controllers/multicluster/serviceexport_controller.go
+++ b/multicluster/controllers/multicluster/serviceexport_controller.go
@@ -19,7 +19,6 @@ package multicluster
 import (
 	"context"
 	"reflect"
-	"sort"
 
 	corev1 "k8s.io/api/core/v1"
 	apiequality "k8s.io/apimachinery/pkg/api/equality"
@@ -51,14 +50,6 @@ type (
 		svcType    string
 	}
 
-	epInfo struct {
-		name       string
-		namespace  string
-		addressIPs []string
-		ports      []corev1.EndpointPort
-		labels     map[string]string
-	}
-
 	// ServiceExportReconciler reconciles a ServiceExport object in the member cluster.
 	ServiceExportReconciler struct {
 		client.Client
@@ -75,7 +66,6 @@ type (
 const (
 	// cached indexer
 	svcIndexerByType = "svc.type"
-	epIndexerByLabel = "ep.label"
 )
 
 type reason int
@@ -96,9 +86,6 @@ func NewServiceExportReconciler(
 		installedSvcs: cache.NewIndexer(svcInfoKeyFunc, cache.Indexers{
 			svcIndexerByType: svcIndexerByTypeFunc,
 		}),
-		installedEps: cache.NewIndexer(epInfoKeyFunc, cache.Indexers{
-			epIndexerByLabel: epIndexerByLabelFunc,
-		}),
 	}
 	return reconciler
 }
@@ -112,46 +99,23 @@ func svcIndexerByTypeFunc(obj interface{}) ([]string, error) {
 	return []string{obj.(*svcInfo).svcType}, nil
 }
 
-func epInfoKeyFunc(obj interface{}) (string, error) {
-	ep := obj.(*epInfo)
-	return common.NamespacedName(ep.namespace, ep.name), nil
-}
-
-func epIndexerByLabelFunc(obj interface{}) ([]string, error) {
-	var info []string
-	ep := obj.(*epInfo)
-	keys := make([]string, len(ep.labels))
-	i := 0
-	for k := range ep.labels {
-		keys[i] = k
-		i++
-	}
-	sort.Strings(keys)
-	for _, k := range keys {
-		info = append(info, k+ep.labels[k])
-	}
-	return info, nil
-}
-
 //+kubebuilder:rbac:groups=multicluster.crd.antrea.io,resources=resourceexports,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=multicluster.crd.antrea.io,resources=resourceexports/status,verbs=get;update;patch
 //+kubebuilder:rbac:groups=multicluster.crd.antrea.io,resources=resourceexports/finalizers,verbs=update
 //+kubebuilder:rbac:groups=multicluster.x-k8s.io,resources=serviceexports,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=multicluster.x-k8s.io,resources=serviceexports/status,verbs=get;update;patch
 //+kubebuilder:rbac:groups="",resources=services,verbs=get;list;watch;update
-//+kubebuilder:rbac:groups="",resources=endpoints,verbs=get;list;watch;update
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.
 // For ServiceExport Reconcile, it watches events of ServiceExport resources,
-// and also Endpoints/Services resource. It will create/update/remove ResourceExport
+// and also Services resource. It will create/update/remove ResourceExport
 // in a leader cluster for corresponding ServiceExport from a member cluster.
 func (r *ServiceExportReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	klog.V(2).InfoS("Reconciling ServiceExport", "serviceexport", req.NamespacedName)
 	svcExportList := &k8smcsv1alpha1.ServiceExportList{}
 	err := r.Client.List(ctx, svcExportList, &client.ListOptions{})
 	if err != nil {
-		klog.ErrorS(err, "Failed to list ServiceExport")
 		return ctrl.Result{}, err
 	}
 
@@ -171,7 +135,6 @@ func (r *ServiceExportReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 
 	var svcExport k8smcsv1alpha1.ServiceExport
 	svcObj, svcInstalled, _ := r.installedSvcs.GetByKey(req.String())
-	epObj, epInstalled, _ := r.installedEps.GetByKey(req.String())
 	svcResExportName := getResourceExportName(r.localClusterID, req, "service")
 	epResExportName := getResourceExportName(r.localClusterID, req, "endpoints")
 
@@ -181,14 +144,11 @@ func (r *ServiceExportReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 			if err != nil {
 				return err
 			}
-			r.installedSvcs.Delete(svcObj)
-		}
-		if epInstalled {
 			err = r.handleEndpointDeleteEvent(ctx, req, commonArea)
 			if err != nil {
 				return err
 			}
-			r.installedEps.Delete(epObj)
+			r.installedSvcs.Delete(svcObj)
 		}
 		return nil
 	}
@@ -224,8 +184,8 @@ func (r *ServiceExportReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		}
 	}
 
-	// skip if ServiceExport is trying to export MC Service/Endpoints
-	if !svcInstalled || !epInstalled {
+	// Skip if ServiceExport is trying to export MC Service.
+	if !svcInstalled {
 		if _, ok := svc.Annotations[common.AntreaMCServiceAnnotation]; ok {
 			klog.InfoS("It's not allowed to export the multi-cluster controller auto-generated Service", "service", req.String())
 			err = r.updateSvcExportStatus(ctx, req, importedService)
@@ -236,9 +196,9 @@ func (r *ServiceExportReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		}
 	}
 
-	// We also watch Service and Endpoints events via events mapping function.
-	// Need to check cache and compare with cache if there is any change for Service or Endpoints.
-	var svcNoChange, epNoChange bool
+	// We also watch Service events via events mapping function.
+	// Need to check cache and compare with cache if there is any change for Service.
+	var svcNoChange bool
 	svcExportNSName := common.NamespacedName(r.leaderNamespace, svcResExportName)
 	epExportNSName := common.NamespacedName(r.leaderNamespace, epResExportName)
 	if svcInstalled {
@@ -257,31 +217,9 @@ func (r *ServiceExportReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 			Namespace: req.Namespace,
 		},
 	}
+	ep.Subsets = []corev1.EndpointSubset{common.GetServiceEndpointSubset(svc)}
 
-	err = r.Client.Get(ctx, req.NamespacedName, ep)
-	if err != nil {
-		klog.ErrorS(err, "Failed to get Endpoints", "endpoints", req.String())
-		if apierrors.IsNotFound(err) && epInstalled {
-			err = r.handleEndpointDeleteEvent(ctx, req, commonArea)
-			if err != nil {
-				return ctrl.Result{}, err
-			}
-			r.installedEps.Delete(epObj)
-		}
-		return ctrl.Result{}, client.IgnoreNotFound(err)
-	}
-
-	if epInstalled {
-		installedEp := epObj.(*epInfo)
-		if apiequality.Semantic.DeepEqual(getEndPointsPorts(ep), installedEp.ports) &&
-			apiequality.Semantic.DeepEqual(getEndPointsAddress(ep), installedEp.addressIPs) {
-			klog.InfoS("Endpoints has been converted into ResourceExport and no change, skip it", "endpoints",
-				req.String(), "resourceexport", epExportNSName)
-			epNoChange = true
-		}
-	}
-
-	if epNoChange && svcNoChange {
+	if svcNoChange {
 		return ctrl.Result{}, nil
 	}
 
@@ -309,12 +247,10 @@ func (r *ServiceExportReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 			klog.ErrorS(err, "Failed to handle Service change", "service", req.String())
 			return ctrl.Result{}, err
 		}
-	}
 
-	if !epNoChange {
 		klog.InfoS("Endpoints have new change, update ResourceExport", "endpoints",
 			req.String(), "resourceexport", epExportNSName)
-		err := r.endpointsHandler(ctx, req, ep, epResExportName, re, commonArea)
+		err = r.endpointsHandler(ctx, req, ep, epResExportName, re, commonArea)
 		if err != nil {
 			klog.ErrorS(err, "Failed to handle Endpoints change", "endpoints", req.String())
 			return ctrl.Result{}, err
@@ -438,19 +374,18 @@ func (r *ServiceExportReconciler) updateSvcExportStatus(ctx context.Context, req
 func (r *ServiceExportReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&k8smcsv1alpha1.ServiceExport{}).
-		Watches(&source.Kind{Type: &corev1.Service{}}, handler.EnqueueRequestsFromMapFunc(serviceAndEndpointMapFunc)).
-		Watches(&source.Kind{Type: &corev1.Endpoints{}}, handler.EnqueueRequestsFromMapFunc(serviceAndEndpointMapFunc)).
+		Watches(&source.Kind{Type: &corev1.Service{}}, handler.EnqueueRequestsFromMapFunc(serviceMapFunc)).
 		WithOptions(controller.Options{
 			MaxConcurrentReconciles: common.DefaultWorkerCount,
 		}).
 		Complete(r)
 }
 
-// serviceAndEndpointMapFunc simply maps all Service and Endpoints events to ServiceExports.
-// When there are any Service/Endpoints changes, it might be reflected in ResourceExport
-// in Leader cluster as well, so ServiceExportReconciler also needs to watch Service
-// and Endpoints events.
-func serviceAndEndpointMapFunc(a client.Object) []reconcile.Request {
+// serviceMapFunc simply maps all Service events to ServiceExports.
+// When there are any Service changes, it might be reflected in ResourceExport
+// in Leader cluster as well, so ServiceExportReconciler also needs to watch
+// Service events.
+func serviceMapFunc(a client.Object) []reconcile.Request {
 	return []reconcile.Request{
 		{
 			NamespacedName: types.NamespacedName{
@@ -505,13 +440,6 @@ func (r *ServiceExportReconciler) endpointsHandler(
 	re mcsv1alpha1.ResourceExport,
 	rc commonarea.RemoteCommonArea) error {
 	kind := common.EndpointsKind
-	epInfo := &epInfo{
-		name:       ep.Name,
-		namespace:  ep.Namespace,
-		addressIPs: getEndPointsAddress(ep),
-		ports:      getEndPointsPorts(ep),
-		labels:     ep.Labels,
-	}
 	r.refreshResourceExport(resName, kind, nil, ep, &re)
 	existingResExport := &mcsv1alpha1.ResourceExport{}
 	resNamespaced := types.NamespacedName{Namespace: rc.GetNamespace(), Name: resName}
@@ -525,7 +453,6 @@ func (r *ServiceExportReconciler) endpointsHandler(
 	if err = r.updateOrCreateResourceExport(resName, ctx, req, &re, existingResExport, rc); err != nil {
 		return err
 	}
-	r.installedEps.Add(epInfo)
 	return nil
 }
 
@@ -544,7 +471,7 @@ func (r *ServiceExportReconciler) refreshResourceExport(resName, kind string,
 	case common.EndpointsKind:
 		re.ObjectMeta.Name = resName
 		re.Spec.Endpoints = &mcsv1alpha1.EndpointsExport{
-			Subsets: common.FilterEndpointSubsets(ep.Subsets),
+			Subsets: ep.Subsets,
 		}
 		re.Labels[common.SourceKind] = common.EndpointsKind
 	}
@@ -594,24 +521,6 @@ func addAnnotation(svcExport *k8smcsv1alpha1.ServiceExport, localClusterID strin
 	}
 }
 
-func getEndPointsAddress(ep *corev1.Endpoints) []string {
-	var epAddrs []string
-	for _, s := range ep.Subsets {
-		for _, a := range s.Addresses {
-			epAddrs = append(epAddrs, a.IP)
-		}
-	}
-	return epAddrs
-}
-
-func getEndPointsPorts(ep *corev1.Endpoints) []corev1.EndpointPort {
-	var epPorts []corev1.EndpointPort
-	for _, s := range ep.Subsets {
-		epPorts = append(epPorts, s.Ports...)
-	}
-	return epPorts
-}
-
 func getResourceExportName(clusterID string, req ctrl.Request, kind string) string {
 	return clusterID + "-" + req.Namespace + "-" + req.Name + "-" + kind
 }
diff --git a/multicluster/controllers/multicluster/serviceexport_controller_test.go b/multicluster/controllers/multicluster/serviceexport_controller_test.go
index 0378bc122c5..5bf9a55b382 100644
--- a/multicluster/controllers/multicluster/serviceexport_controller_test.go
+++ b/multicluster/controllers/multicluster/serviceexport_controller_test.go
@@ -71,10 +71,6 @@ func TestServiceExportReconciler_handleDeleteEvent(t *testing.T) {
 		name:      svcNginx.Name,
 		namespace: svcNginx.Namespace,
 	})
-	r.installedEps.Add(&epInfo{
-		name:      epNginx.Name,
-		namespace: epNginx.Namespace,
-	})
 	if _, err := r.Reconcile(ctx, nginxReq); err != nil {
 		t.Errorf("ServiceExport Reconciler should handle delete event successfully but got error = %v", err)
 	} else {
@@ -235,18 +231,9 @@ func TestServiceExportReconciler_handleServiceUpdateEvent(t *testing.T) {
 		ports:      svcNginx.Spec.Ports,
 		svcType:    string(svcNginx.Spec.Type),
 	}
-	epInfo := &epInfo{
-		name:       epNginx.Name,
-		namespace:  epNginx.Namespace,
-		addressIPs: getEndPointsAddress(epNginx),
-		ports:      getEndPointsPorts(epNginx),
-		labels:     epNginx.Labels,
-	}
 
 	newSvcNginx := svcNginx.DeepCopy()
 	newSvcNginx.Spec.Ports = []corev1.ServicePort{svcPort8080}
-	newEpNginx := epNginx.DeepCopy()
-	newEpNginx.Subsets[0].Ports = epPorts8080
 
 	re := mcsv1alpha1.ResourceExport{
 		ObjectMeta: metav1.ObjectMeta{
@@ -272,7 +259,7 @@ func TestServiceExportReconciler_handleServiceUpdateEvent(t *testing.T) {
 	existEpRe.Name = "cluster-a-default-nginx-endpoints"
 	existEpRe.Spec.Endpoints = &mcsv1alpha1.EndpointsExport{Subsets: epNginxSubset}
 
-	fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(newSvcNginx, newEpNginx, existSvcExport).Build()
+	fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(newSvcNginx, existSvcExport).Build()
 	fakeRemoteClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(existSvcRe, existEpRe).Build()
 
 	_ = commonarea.NewFakeRemoteCommonArea(scheme, remoteMgr, fakeRemoteClient, "leader-cluster", "default")
@@ -280,7 +267,6 @@ func TestServiceExportReconciler_handleServiceUpdateEvent(t *testing.T) {
 	mcReconciler.SetRemoteCommonAreaManager(remoteMgr)
 	r := NewServiceExportReconciler(fakeClient, scheme, mcReconciler)
 	r.installedSvcs.Add(sinfo)
-	r.installedEps.Add(epInfo)
 	if _, err := r.Reconcile(ctx, nginxReq); err != nil {
 		t.Errorf("ServiceExport Reconciler should update ResourceExports but got error = %v", err)
 	} else {
@@ -311,7 +297,7 @@ func TestServiceExportReconciler_handleServiceUpdateEvent(t *testing.T) {
 				{
 					Addresses: []corev1.EndpointAddress{
 						{
-							IP: "192.168.17.11",
+							IP: "192.168.2.3",
 						},
 					},
 					Ports: epPorts8080,
@@ -327,7 +313,7 @@ func TestServiceExportReconciler_handleServiceUpdateEvent(t *testing.T) {
 	}
 }
 
-func Test_serviceAndEndpointMapFunc(t *testing.T) {
+func Test_serviceMapFunc(t *testing.T) {
 	tests := []struct {
 		name string
 		obj  client.Object
@@ -350,28 +336,11 @@ func Test_serviceAndEndpointMapFunc(t *testing.T) {
 				},
 			},
 		},
-		{
-			name: "map Endpoints Object event",
-			obj: &corev1.Endpoints{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "nginx",
-					Namespace: "default",
-				},
-			},
-			want: []reconcile.Request{
-				{
-					NamespacedName: types.NamespacedName{
-						Name:      "nginx",
-						Namespace: "default",
-					},
-				},
-			},
-		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := serviceAndEndpointMapFunc(tt.obj); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("Test_serviceAndEndpointMapFunc() = %v, want %v", got, tt.want)
+			if got := serviceMapFunc(tt.obj); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("Test_serviceMapFunc() = %v, want %v", got, tt.want)
 			}
 		})
 	}
diff --git a/multicluster/hack/mc-integration-test.sh b/multicluster/hack/mc-integration-test.sh
index 5fa1b1f1205..1ea2eaef771 100755
--- a/multicluster/hack/mc-integration-test.sh
+++ b/multicluster/hack/mc-integration-test.sh
@@ -17,7 +17,7 @@
 set -e
 
 clean_up() {
-  kind delete cluster --name antrea-integration-kind
+  kind delete cluster --name antrea-integration
 }
 
 trap clean_up EXIT
@@ -29,7 +29,7 @@ if [[ "$WORKDIR" != "" ]];then
 fi
 
 echo "" > /tmp/mc-integration-kubeconfig
-kind create cluster --name=antrea-integration-kind --kubeconfig=/tmp/mc-integration-kubeconfig
+kind create cluster --name=antrea-integration --kubeconfig=/tmp/mc-integration-kubeconfig
 sleep 5
 export KUBECONFIG=/tmp/mc-integration-kubeconfig
 kubectl create namespace leader-ns
@@ -38,7 +38,7 @@ kubectl apply -f test/integration/cluster-admin.yml
 
 if [[ $NO_LOCAL == "true" ]];then
   # Run go test in a Docker container
-  container_ip=$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' antrea-integration-kind-control-plane)
+  container_ip=$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' antrea-integration-control-plane)
   sed -i "s|server: https://.*|server: https://${container_ip}:6443|" /tmp/mc-integration-kubeconfig
   docker run --network kind --privileged --rm \
 	  -w /usr/src/antrea.io/antrea \
diff --git a/multicluster/test/e2e/service_test.go b/multicluster/test/e2e/service_test.go
index 1a90fd49d95..578075ef894 100644
--- a/multicluster/test/e2e/service_test.go
+++ b/multicluster/test/e2e/service_test.go
@@ -186,12 +186,12 @@ func (data *MCTestData) deleteServiceExport(clusterName string) error {
 
 // getNodeNamesFromCluster will pick up a Node randomly as the Gateway
 // and also a regular Node from the specified cluster.
-func getNodeNamesFromCluster(nodeName string) (string, string, error) {
-	rc, output, stderr, err := provider.RunCommandOnNode(nodeName, "kubectl get node -o custom-columns=:metadata.name --no-headers")
+func getNodeNamesFromCluster(clusterName string) (string, string, error) {
+	rc, output, stderr, err := provider.RunCommandOnNode(clusterName, "kubectl get node -o jsonpath='{range .items[*]}{.metadata.name}{\" \"}{end}'")
 	if err != nil || rc != 0 || stderr != "" {
 		return "", "", fmt.Errorf("error when getting Node list: %v, stderr: %s", err, stderr)
 	}
-	nodes := strings.Split(output, "\n")
+	nodes := strings.Split(strings.TrimRight(output, " "), " ")
 	gwIdx := rand.Intn(len(nodes)) // #nosec G404: for test only
 	var regularNode string
 	for i, node := range nodes {
diff --git a/multicluster/test/integration/README.md b/multicluster/test/integration/README.md
index 42b1b77e267..6fb9da365b5 100644
--- a/multicluster/test/integration/README.md
+++ b/multicluster/test/integration/README.md
@@ -12,7 +12,7 @@ like Service, Endpoints controllers etc.
 
 The tests must be run on an real Kubernetes cluster. At the moment, you can
 simply run `make test-integration` in `antrea/multicluster` folder. It will
-create a Kind cluster named `antrea-integration-kind` and execute the integration
+create a Kind cluster named `antrea-integration` and execute the integration
 codes.
 
 if you'd like to run the integration test in an existing Kubernetes cluster, you
diff --git a/multicluster/test/integration/resourceexport_controller_test.go b/multicluster/test/integration/resourceexport_controller_test.go
index 6cb8bcab0dd..8c0f6748743 100644
--- a/multicluster/test/integration/resourceexport_controller_test.go
+++ b/multicluster/test/integration/resourceexport_controller_test.go
@@ -163,8 +163,8 @@ var _ = Describe("ResourceExport controller", func() {
 				Subsets: []corev1.EndpointSubset{
 					{
 						Addresses: []corev1.EndpointAddress{
+							addr2,
 							addr3,
-							addr4,
 						},
 						Ports: epPorts,
 					},
diff --git a/multicluster/test/integration/serviceexport_controller_test.go b/multicluster/test/integration/serviceexport_controller_test.go
index 439a2c9e6c2..d01dbc7ced2 100644
--- a/multicluster/test/integration/serviceexport_controller_test.go
+++ b/multicluster/test/integration/serviceexport_controller_test.go
@@ -53,25 +53,7 @@ var _ = Describe("ServiceExport controller", func() {
 		Namespace: svc.Namespace,
 		Name:      svc.Name,
 	}
-	epNamespacedName := svcNamespacedName
 
-	ep := &corev1.Endpoints{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "nginx-svc",
-			Namespace: testNamespace,
-		},
-		Subsets: []corev1.EndpointSubset{
-			{
-				Addresses: []corev1.EndpointAddress{
-					addr1,
-				},
-				NotReadyAddresses: []corev1.EndpointAddress{
-					addr2,
-				},
-				Ports: epPorts,
-			},
-		},
-	}
 	svcExport := &k8smcsv1alpha1.ServiceExport{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "nginx-svc",
@@ -85,7 +67,7 @@ var _ = Describe("ServiceExport controller", func() {
 		},
 	}
 	svcResExportName := LocalClusterID + "-" + svc.Namespace + "-" + svc.Name + "-service"
-	epResExportName := LocalClusterID + "-" + ep.Namespace + "-" + ep.Name + "-endpoints"
+	epResExportName := LocalClusterID + "-" + svc.Namespace + "-" + svc.Name + "-endpoints"
 
 	expectedEpResExport := &mcsv1alpha1.ResourceExport{
 		ObjectMeta: metav1.ObjectMeta{
@@ -94,8 +76,8 @@ var _ = Describe("ServiceExport controller", func() {
 		},
 		Spec: mcsv1alpha1.ResourceExportSpec{
 			ClusterID: LocalClusterID,
-			Name:      ep.Name,
-			Namespace: ep.Namespace,
+			Name:      svc.Name,
+			Namespace: svc.Namespace,
 			Kind:      common.EndpointsKind,
 		},
 	}
@@ -103,20 +85,7 @@ var _ = Describe("ServiceExport controller", func() {
 	ctx := context.Background()
 	It("Should create ResourceExports when new ServiceExport for ClusterIP Service is created", func() {
 		By("By exposing a ClusterIP type of Service")
-		expectedEpResExport.Spec.Endpoints = &mcsv1alpha1.EndpointsExport{
-			Subsets: []corev1.EndpointSubset{
-				{
-					Addresses: []corev1.EndpointAddress{
-						{
-							IP: "192.168.17.11",
-						},
-					},
-					Ports: epPorts,
-				},
-			},
-		}
 		Expect(k8sClient.Create(ctx, svc)).Should(Succeed())
-		Expect(k8sClient.Create(ctx, ep)).Should(Succeed())
 		Expect(k8sClient.Create(ctx, svcExport)).Should(Succeed())
 		var err error
 		latestSvc := &corev1.Service{}
@@ -131,6 +100,18 @@ var _ = Describe("ServiceExport controller", func() {
 		Expect(svcResExport.ObjectMeta.Labels["sourceKind"]).Should(Equal("Service"))
 		Expect(svcResExport.Spec.Service.ServiceSpec.ClusterIP).Should(Equal(latestSvc.Spec.ClusterIP))
 		Expect(len(svcResExport.Spec.Service.ServiceSpec.Ports)).Should(Equal(len(svcPorts)))
+		expectedEpResExport.Spec.Endpoints = &mcsv1alpha1.EndpointsExport{
+			Subsets: []corev1.EndpointSubset{
+				{
+					Addresses: []corev1.EndpointAddress{
+						{
+							IP: latestSvc.Spec.ClusterIP,
+						},
+					},
+					Ports: epPorts,
+				},
+			},
+		}
 		Eventually(func() bool {
 			err = k8sClient.Get(ctx, types.NamespacedName{Namespace: LeaderNamespace, Name: epResExportName}, epResExport)
 			return err == nil
@@ -180,42 +161,6 @@ var _ = Describe("ServiceExport controller", func() {
 		Expect(*conditions[0].Message).Should(Equal("the Service does not exist"))
 	})
 
-	It("Should update existing ResourceExport when corresponding Endpoints has new Endpoint", func() {
-		By("By update an Endpoint with a new address")
-		latestEp := &corev1.Endpoints{}
-		Expect(k8sClient.Get(ctx, epNamespacedName, latestEp)).Should(Succeed())
-		addresses := latestEp.Subsets[0].Addresses
-		addresses = append(addresses, addr3)
-		latestEp.Subsets[0].Addresses = addresses
-		Expect(k8sClient.Update(ctx, latestEp)).Should(Succeed())
-		time.Sleep(2 * time.Second)
-		epResExport := &mcsv1alpha1.ResourceExport{}
-		expectedEpResExport.Spec.Endpoints = &mcsv1alpha1.EndpointsExport{
-			Subsets: []corev1.EndpointSubset{
-				{
-					Addresses: []corev1.EndpointAddress{
-						{
-							IP: "192.168.17.11",
-						},
-						{
-							IP: "192.168.17.13",
-						},
-					},
-					Ports: epPorts,
-				},
-			},
-		}
-
-		var err error
-		Eventually(func() bool {
-			err = k8sClient.Get(ctx, types.NamespacedName{Namespace: LeaderNamespace, Name: epResExportName}, epResExport)
-			return err == nil
-		}, timeout, interval).Should(BeTrue())
-		Expect(epResExport.ObjectMeta.Labels["sourceKind"]).Should(Equal("Endpoints"))
-		Expect(epResExport.Spec).Should(Equal(expectedEpResExport.Spec))
-
-	})
-
 	It("Should delete existing ResourceExport when existing ServiceExport is deleted", func() {
 		By("By remove a ServiceExport resource")
 		err := k8sClient.Delete(ctx, svcExport)
diff --git a/multicluster/test/integration/test_data.go b/multicluster/test/integration/test_data.go
index c2b6c59cd8f..e5abc57ddd1 100644
--- a/multicluster/test/integration/test_data.go
+++ b/multicluster/test/integration/test_data.go
@@ -29,10 +29,6 @@ var (
 		IP:       "192.168.17.13",
 		Hostname: "pod3",
 	}
-	addr4 = corev1.EndpointAddress{
-		IP:       "192.168.17.14",
-		Hostname: "pod4",
-	}
 	epPorts = []corev1.EndpointPort{
 		{
 			Name:     "http",