merge endpoints filter into service topology filter (#963)

cmd/yurthub/app/config/config.go

@@ -43,7 +43,6 @@ import (
 	"github.com/openyurtio/openyurt/pkg/yurthub/cachemanager"
 	"github.com/openyurtio/openyurt/pkg/yurthub/filter"
 	"github.com/openyurtio/openyurt/pkg/yurthub/filter/discardcloudservice"
-	"github.com/openyurtio/openyurt/pkg/yurthub/filter/endpointsfilter"
 	"github.com/openyurtio/openyurt/pkg/yurthub/filter/initializer"
 	"github.com/openyurtio/openyurt/pkg/yurthub/filter/masterservice"
 	"github.com/openyurtio/openyurt/pkg/yurthub/filter/servicetopology"
@@ -297,7 +296,6 @@ func registerAllFilters(filters *filter.Filters) {
 	servicetopology.Register(filters)
 	masterservice.Register(filters)
 	discardcloudservice.Register(filters)
-	endpointsfilter.Register(filters)
 }
 
 // generateNameToFilterMapping return union filters that initializations completed.

pkg/yurthub/filter/approver.go

@@ -47,10 +47,10 @@ var (
 	defaultReqKeyToName      = map[string]string{
 		reqKey("kubelet", "services", "list"):                    MasterServiceFilterName,
 		reqKey("kubelet", "services", "watch"):                   MasterServiceFilterName,
-		reqKey("nginx-ingress-controller", "endpoints", "list"):  EndpointsFilterName,
-		reqKey("nginx-ingress-controller", "endpoints", "watch"): EndpointsFilterName,
 		reqKey("kube-proxy", "services", "list"):                 DiscardCloudServiceFilterName,
 		reqKey("kube-proxy", "services", "watch"):                DiscardCloudServiceFilterName,
+		reqKey("nginx-ingress-controller", "endpoints", "list"):  ServiceTopologyFilterName,
+		reqKey("nginx-ingress-controller", "endpoints", "watch"): ServiceTopologyFilterName,
 		reqKey("kube-proxy", "endpointslices", "list"):           ServiceTopologyFilterName,
 		reqKey("kube-proxy", "endpointslices", "watch"):          ServiceTopologyFilterName,
 	}

pkg/yurthub/filter/approver_test.go

@@ -88,13 +88,13 @@ func TestGetFilterName(t *testing.T) {
 			userAgent:    "nginx-ingress-controller/v1.1.0",
 			verb:         "GET",
 			path:         "/api/v1/endpoints",
-			resultFilter: EndpointsFilterName,
+			resultFilter: ServiceTopologyFilterName,
 		},
 		"nginx-ingress-controller watch endpoints": {
 			userAgent:    "nginx-ingress-controller/v1.1.0",
 			verb:         "GET",
 			path:         "/api/v1/endpoints?watch=true",
-			resultFilter: EndpointsFilterName,
+			resultFilter: ServiceTopologyFilterName,
 		},
 		"list endpoints without user agent": {
 			verb:         "GET",

pkg/yurthub/filter/constant.go

@@ -33,10 +33,6 @@ const (
 	// If end users want to use specified LB service at the edge side,
 	// End users should add annotation["openyurt.io/skip-discard"]="true" for LB service.
 	SkipDiscardServiceAnnotation = "openyurt.io/skip-discard"
-
-	// EndpointsFilterName is used to reassemble endpoints in order to make the data traffic be
-	// load balanced only to the nodepool valid endpoints.
-	EndpointsFilterName = "endpoints"
 )
 
 // DisabledInCloudMode contains the filters that should be disabled when yurthub is working in cloud mode.