util: remove eviction-related duplicate implementations (#1393)

Signed-off-by: lisen <lisen@youzan.com>
Co-authored-by: lisen <lisen@youzan.com>

pkg/descheduler/controllers/migration/evictor/evictor_native.go

@@ -25,7 +25,7 @@ import (
 
 	sev1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1"
 	"github.com/koordinator-sh/koordinator/pkg/descheduler/evictions"
-	evictutils "github.com/koordinator-sh/koordinator/pkg/descheduler/evictions/utils"
+	"github.com/koordinator-sh/koordinator/pkg/util"
 )
 
 func init() {
@@ -42,7 +42,7 @@ type NativeEvictor struct {
 }
 
 func NewNativeEvictor(client kubernetes.Interface) (Interface, error) {
-	policyGroupVersion, err := evictutils.SupportEviction(client)
+	policyGroupVersion, err := util.SupportEviction(client)
 	if err != nil {
 		return nil, fmt.Errorf("failed to fetch eviction groupVersion: %v", err)
 	}

pkg/descheduler/evictions/evictions.go

@@ -34,12 +34,12 @@ import (
 	"k8s.io/klog/v2"
 	"k8s.io/utils/pointer"
 
-	evictutils "github.com/koordinator-sh/koordinator/pkg/descheduler/evictions/utils"
 	"github.com/koordinator-sh/koordinator/pkg/descheduler/framework"
 	"github.com/koordinator-sh/koordinator/pkg/descheduler/metrics"
 	nodeutil "github.com/koordinator-sh/koordinator/pkg/descheduler/node"
 	podutil "github.com/koordinator-sh/koordinator/pkg/descheduler/pod"
 	"github.com/koordinator-sh/koordinator/pkg/descheduler/utils"
+	"github.com/koordinator-sh/koordinator/pkg/util"
 )
 
 const (
@@ -164,7 +164,7 @@ func (pe *PodEvictor) Evict(ctx context.Context, pod *corev1.Pod, opts framework
 
 func EvictPod(ctx context.Context, client clientset.Interface, pod *corev1.Pod, policyGroupVersion string, deleteOptions *metav1.DeleteOptions) error {
 	var err error
-	if policyGroupVersion == evictutils.EvictionGroupName+"/v1beta1" {
+	if policyGroupVersion == util.EvictionGroupName+"/v1beta1" {
 		eviction := &policyv1beta1.Eviction{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      pod.Name,

pkg/descheduler/framework/plugins/kubernetes/defaultevictor/evictor.go

@@ -29,9 +29,9 @@ import (
 
 	"github.com/koordinator-sh/koordinator/pkg/descheduler/apis/config/v1alpha2"
 	"github.com/koordinator-sh/koordinator/pkg/descheduler/evictions"
-	evictutils "github.com/koordinator-sh/koordinator/pkg/descheduler/evictions/utils"
 	"github.com/koordinator-sh/koordinator/pkg/descheduler/framework"
 	"github.com/koordinator-sh/koordinator/pkg/descheduler/framework/plugins/kubernetes/adaptor"
+	"github.com/koordinator-sh/koordinator/pkg/util"
 )
 
 const (
@@ -79,7 +79,7 @@ func New(args runtime.Object, handle framework.Handle) (framework.Plugin, error)
 		return nil, err
 	}
 
-	policyGroupVersion, err := evictutils.SupportEviction(handle.ClientSet())
+	policyGroupVersion, err := util.SupportEviction(handle.ClientSet())
 	if err != nil {
 		return nil, fmt.Errorf("failed to fetch eviction groupVersion: %v", err)
 	}

pkg/descheduler/framework/plugins/loadaware/low_node_load_test.go

@@ -40,7 +40,6 @@ import (
 	koordfake "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/fake"
 	deschedulerconfig "github.com/koordinator-sh/koordinator/pkg/descheduler/apis/config"
 	"github.com/koordinator-sh/koordinator/pkg/descheduler/evictions"
-	evictutils "github.com/koordinator-sh/koordinator/pkg/descheduler/evictions/utils"
 	"github.com/koordinator-sh/koordinator/pkg/descheduler/framework"
 	"github.com/koordinator-sh/koordinator/pkg/descheduler/framework/plugins/kubernetes/defaultevictor"
 	frameworkruntime "github.com/koordinator-sh/koordinator/pkg/descheduler/framework/runtime"
@@ -63,8 +62,8 @@ func setupFakeDiscoveryWithPolicyResource(fake *coretesting.Fake) {
 				GroupVersion: policy.SchemeGroupVersion.String(),
 				APIResources: []metav1.APIResource{
 					{
-						Name: evictutils.EvictionSubResouceName,
-						Kind: evictutils.EvictionKind,
+						Name: util.EvictionSubResourceName,
+						Kind: util.EvictionKind,
 					},
 				},
 			},
@@ -77,8 +76,8 @@ func setupFakeDiscoveryWithPolicyResource(fake *coretesting.Fake) {
 				GroupVersion: "v1",
 				APIResources: []metav1.APIResource{
 					{
-						Name: evictutils.EvictionSubResouceName,
-						Kind: evictutils.EvictionKind,
+						Name: util.EvictionSubResourceName,
+						Kind: util.EvictionKind,
 					},
 				},
 			},

pkg/koordlet/resmanager/resmanager_test.go

@@ -202,8 +202,10 @@ func setupFakeDiscoveryWithPolicyResource(fake *coretesting.Fake, groupVersion s
 				GroupVersion: "v1",
 				APIResources: []metav1.APIResource{
 					{
-						Name: util.EvictionSubResourceName,
-						Kind: util.EvictionKind,
+						Name:    util.EvictionSubResourceName,
+						Kind:    util.EvictionKind,
+						Group:   util.EvictionGroupName,
+						Version: "v1",
 					},
 				},
 			},

pkg/util/pod_evict.go

@@ -19,6 +19,9 @@ package util
 import (
 	"context"
 	"fmt"
+	"strings"
+
+	"k8s.io/apimachinery/pkg/api/errors"
 
 	policyv1 "k8s.io/api/policy/v1"
 	policyv1beta1 "k8s.io/api/policy/v1beta1"
@@ -61,41 +64,60 @@ func EvictPodByVersion(ctx context.Context, kubernetes kubernetes.Interface, nam
 	return fmt.Errorf("not support evict version, %s", evictVersion)
 }
 
-func FindSupportedEvictVersion(client kubernetes.Interface) (groupVersion string, err error) {
+func FindSupportedEvictVersion(client kubernetes.Interface) (version string, err error) {
 	var (
-		serverGroups     *metav1.APIGroupList
-		resourceList     *metav1.APIResourceList
-		foundPolicyGroup bool
-		preferredVersion string
+		groupVersion string
 	)
+	groupVersion, err = SupportEviction(client)
+	if err != nil {
+		return
+	}
+	if groupVersion == "" || !strings.Contains(groupVersion, "/") {
+		return
+	}
+	version = strings.Split(groupVersion, "/")[1]
+	return
+}
 
+func SupportEviction(client kubernetes.Interface) (string, error) {
+	var (
+		serverGroups          *metav1.APIGroupList
+		resourceList          *metav1.APIResourceList
+		foundPolicyGroup      bool
+		preferredGroupVersion string
+		groupVersion          string
+		err                   error
+	)
 	discoveryClient := client.Discovery()
 	serverGroups, err = discoveryClient.ServerGroups()
 	if serverGroups == nil || err != nil {
-		return
+		return groupVersion, err
 	}
 
 	for _, serverGroup := range serverGroups.Groups {
 		if serverGroup.Name == EvictionGroupName {
 			foundPolicyGroup = true
-			preferredVersion = serverGroup.PreferredVersion.Version
+			preferredGroupVersion = serverGroup.PreferredVersion.GroupVersion
 			break
 		}
 	}
 	if !foundPolicyGroup {
-		return
+		return groupVersion, err
 	}
 
 	resourceList, err = discoveryClient.ServerResourcesForGroupVersion("v1")
 	if err != nil {
-		return
+		if errors.IsNotFound(err) {
+			return groupVersion, nil
+		}
+		return groupVersion, err
 	}
 	for _, resource := range resourceList.APIResources {
 		if resource.Name == EvictionSubResourceName && resource.Kind == EvictionKind {
-			groupVersion = preferredVersion
-			return
+			groupVersion = resource.Group + "/" + resource.Version
+			return groupVersion, err
 		}
 	}
-
-	return
+	groupVersion = preferredGroupVersion
+	return groupVersion, err
 }