Migrate plugins to k8s.io/kube-scheduler/framework

Signed-off-by: Antonin Stefanutti <antonin@stefanutti.fr>

Author: astefanutti

pkg/capacityscheduling/capacity_scheduling.go

@@ -23,6 +23,7 @@ import (
 	"testing"
 
 	"k8s.io/apimachinery/pkg/util/sets"
+	fwk "k8s.io/kube-scheduler/framework"
 
 	gocmp "github.com/google/go-cmp/cmp"
 	v1 "k8s.io/api/core/v1"
@@ -67,7 +68,7 @@ func TestPreFilter(t *testing.T) {
 		name          string
 		podInfos      []podInfo
 		elasticQuotas map[string]*ElasticQuotaInfo
-		expected      []framework.Code
+		expected      []fwk.Code
 	}{
 		{
 			name: "pod subjects to ElasticQuota",
@@ -89,9 +90,9 @@ func TestPreFilter(t *testing.T) {
 					},
 				},
 			},
-			expected: []framework.Code{
-				framework.Success,
-				framework.Unschedulable,
+			expected: []fwk.Code{
+				fwk.Success,
+				fwk.Unschedulable,
 			},
 		},
 		{
@@ -125,8 +126,8 @@ func TestPreFilter(t *testing.T) {
 					},
 				},
 			},
-			expected: []framework.Code{
-				framework.Unschedulable,
+			expected: []fwk.Code{
+				fwk.Unschedulable,
 			},
 		},
 		{
@@ -135,8 +136,8 @@ func TestPreFilter(t *testing.T) {
 				{podName: "ns2-p1", podNamespace: "ns2", memReq: 500},
 			},
 			elasticQuotas: map[string]*ElasticQuotaInfo{},
-			expected: []framework.Code{
-				framework.Success,
+			expected: []fwk.Code{
+				fwk.Success,
 			},
 		},
 	}
@@ -175,7 +176,7 @@ func TestPreFilter(t *testing.T) {
 
 			state := framework.NewCycleState()
 			for i := range pods {
-				if _, got := cs.PreFilter(context.TODO(), state, pods[i]); got.Code() != tt.expected[i] {
+				if _, got := cs.PreFilter(context.TODO(), state, pods[i], nil); got.Code() != tt.expected[i] {
 					t.Errorf("expected %v, got %v : %v", tt.expected[i], got.Code(), got.Message())
 				}
 			}
@@ -193,7 +194,7 @@ func TestPostFilter(t *testing.T) {
 		filteredNodesReader framework.NodeToStatusReader
 		elasticQuotas       map[string]*ElasticQuotaInfo
 		wantResult          *framework.PostFilterResult
-		wantStatus          *framework.Status
+		wantStatus          *fwk.Status
 	}{
 		{
 			name: "in-namespace preemption",
@@ -234,7 +235,7 @@ func TestPostFilter(t *testing.T) {
 				},
 			},
 			wantResult: framework.NewPostFilterResultWithNominatedNode("node-a"),
-			wantStatus: framework.NewStatus(framework.Success),
+			wantStatus: fwk.NewStatus(fwk.Success),
 		},
 		{
 			name: "cross-namespace preemption",
@@ -275,7 +276,7 @@ func TestPostFilter(t *testing.T) {
 				},
 			},
 			wantResult: framework.NewPostFilterResultWithNominatedNode("node-a"),
-			wantStatus: framework.NewStatus(framework.Success),
+			wantStatus: fwk.NewStatus(fwk.Success),
 		},
 		{
 			name: "without elasticQuotas",
@@ -291,7 +292,7 @@ func TestPostFilter(t *testing.T) {
 			filteredNodesReader: makeUnschedulableNodeStatusReader(),
 			elasticQuotas:       map[string]*ElasticQuotaInfo{},
 			wantResult:          framework.NewPostFilterResultWithNominatedNode("node-a"),
-			wantStatus:          framework.NewStatus(framework.Success),
+			wantStatus:          fwk.NewStatus(fwk.Success),
 		},
 	}
 
@@ -371,7 +372,7 @@ func TestReserve(t *testing.T) {
 		name          string
 		pods          []*v1.Pod
 		elasticQuotas map[string]*ElasticQuotaInfo
-		expectedCodes []framework.Code
+		expectedCodes []fwk.Code
 		expected      []map[string]*ElasticQuotaInfo
 	}{
 		{
@@ -395,9 +396,9 @@ func TestReserve(t *testing.T) {
 					},
 				},
 			},
-			expectedCodes: []framework.Code{
-				framework.Success,
-				framework.Success,
+			expectedCodes: []fwk.Code{
+				fwk.Success,
+				fwk.Success,
 			},
 			expected: []map[string]*ElasticQuotaInfo{
 				{
@@ -805,7 +806,7 @@ func TestPodEligibleToPreemptOthers(t *testing.T) {
 		pod                 *v1.Pod
 		existPods           []*v1.Pod
 		nodes               []*v1.Node
-		nominatedNodeStatus *framework.Status
+		nominatedNodeStatus *fwk.Status
 		elasticQuotas       map[string]*ElasticQuotaInfo
 		expected            bool
 	}{
@@ -816,7 +817,7 @@ func TestPodEligibleToPreemptOthers(t *testing.T) {
 			nodes: []*v1.Node{
 				st.MakeNode().Name("node-a").Capacity(res).Obj(),
 			},
-			nominatedNodeStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable, tainttoleration.ErrReasonNotMatch),
+			nominatedNodeStatus: fwk.NewStatus(fwk.UnschedulableAndUnresolvable, tainttoleration.ErrReasonNotMatch),
 			elasticQuotas: map[string]*ElasticQuotaInfo{
 				"ns1": {
 					Namespace: "ns1",
@@ -840,7 +841,7 @@ func TestPodEligibleToPreemptOthers(t *testing.T) {
 			nodes: []*v1.Node{
 				st.MakeNode().Name("node-a").Capacity(res).Obj(),
 			},
-			nominatedNodeStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable, tainttoleration.ErrReasonNotMatch),
+			nominatedNodeStatus: fwk.NewStatus(fwk.UnschedulableAndUnresolvable, tainttoleration.ErrReasonNotMatch),
 			elasticQuotas: map[string]*ElasticQuotaInfo{
 				"ns1": {
 					Namespace: "ns1",
@@ -1599,7 +1600,7 @@ func TestDeletePod(t *testing.T) {
 
 func makeUnschedulableNodeStatusReader() *framework.NodeToStatus {
 	nodeStatusReader := framework.NewDefaultNodeToStatus()
-	nodeStatusReader.Set("node-a", framework.NewStatus(framework.Unschedulable))
+	nodeStatusReader.Set("node-a", fwk.NewStatus(fwk.Unschedulable))
 	return nodeStatusReader
 }
 

pkg/capacityscheduling/capacity_scheduling_test.go

@@ -33,6 +33,7 @@ import (
 	listerv1 "k8s.io/client-go/listers/core/v1"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/klog/v2"
+	fwk "k8s.io/kube-scheduler/framework"
 	"k8s.io/kubernetes/pkg/scheduler/framework"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
@@ -58,20 +59,20 @@ type PermitState struct {
 	Activate bool
 }
 
-func (s *PermitState) Clone() framework.StateData {
+func (s *PermitState) Clone() fwk.StateData {
 	return &PermitState{Activate: s.Activate}
 }
 
 // Manager defines the interfaces for PodGroup management.
 type Manager interface {
 	PreFilter(context.Context, *corev1.Pod) error
-	Permit(context.Context, *framework.CycleState, *corev1.Pod) Status
+	Permit(context.Context, fwk.CycleState, *corev1.Pod) Status
 	Unreserve(context.Context, *corev1.Pod)
 	GetPodGroup(context.Context, *corev1.Pod) (string, *v1alpha1.PodGroup)
 	GetAssignedPodCount(string) int
 	GetCreationTimestamp(context.Context, *corev1.Pod, time.Time) time.Time
 	DeletePermittedPodGroup(context.Context, string)
-	ActivateSiblings(ctx context.Context, pod *corev1.Pod, state *framework.CycleState)
+	ActivateSiblings(ctx context.Context, pod *corev1.Pod, state fwk.CycleState)
 	BackoffPodGroup(string, time.Duration)
 }
 
@@ -173,7 +174,7 @@ func (pgMgr *PodGroupManager) BackoffPodGroup(pgName string, backoff time.Durati
 
 // ActivateSiblings stashes the pods belonging to the same PodGroup of the given pod
 // in the given state, with a reserved key "kubernetes.io/pods-to-activate".
-func (pgMgr *PodGroupManager) ActivateSiblings(ctx context.Context, pod *corev1.Pod, state *framework.CycleState) {
+func (pgMgr *PodGroupManager) ActivateSiblings(ctx context.Context, pod *corev1.Pod, state fwk.CycleState) {
 	lh := klog.FromContext(ctx)
 	pgName := util.GetPodGroupLabel(pod)
 	if pgName == "" {
@@ -273,7 +274,7 @@ func (pgMgr *PodGroupManager) PreFilter(ctx context.Context, pod *corev1.Pod) er
 }
 
 // Permit permits a pod to run, if the minMember match, it would send a signal to chan.
-func (pgMgr *PodGroupManager) Permit(ctx context.Context, state *framework.CycleState, pod *corev1.Pod) Status {
+func (pgMgr *PodGroupManager) Permit(ctx context.Context, state fwk.CycleState, pod *corev1.Pod) Status {
 	pgFullName, pg := pgMgr.GetPodGroup(ctx, pod)
 	if pgFullName == "" {
 		return PodGroupNotSpecified
@@ -363,7 +364,7 @@ func (pgMgr *PodGroupManager) GetPodGroup(ctx context.Context, pod *corev1.Pod)
 
 // CheckClusterResource checks if resource capacity of the cluster can satisfy <resourceRequest>.
 // It returns an error detailing the resource gap if not satisfied; otherwise returns nil.
-func CheckClusterResource(ctx context.Context, nodeList []*framework.NodeInfo, resourceRequest corev1.ResourceList, desiredPodGroupName string) error {
+func CheckClusterResource(ctx context.Context, nodeList []fwk.NodeInfo, resourceRequest corev1.ResourceList, desiredPodGroupName string) error {
 	for _, info := range nodeList {
 		if info == nil || info.Node() == nil {
 			continue
@@ -390,32 +391,32 @@ func GetNamespacedName(obj metav1.Object) string {
 	return fmt.Sprintf("%v/%v", obj.GetNamespace(), obj.GetName())
 }
 
-func getNodeResource(ctx context.Context, info *framework.NodeInfo, desiredPodGroupName string) *framework.Resource {
+func getNodeResource(ctx context.Context, info fwk.NodeInfo, desiredPodGroupName string) fwk.Resource {
 	nodeClone := info.Snapshot()
 	logger := klog.FromContext(ctx)
-	for _, podInfo := range info.Pods {
-		if podInfo == nil || podInfo.Pod == nil {
+	for _, podInfo := range info.GetPods() {
+		if podInfo == nil || podInfo.GetPod() == nil {
 			continue
 		}
-		if util.GetPodGroupFullName(podInfo.Pod) != desiredPodGroupName {
+		if util.GetPodGroupFullName(podInfo.GetPod()) != desiredPodGroupName {
 			continue
 		}
-		nodeClone.RemovePod(logger, podInfo.Pod)
+		nodeClone.RemovePod(logger, podInfo.GetPod())
 	}
 
 	leftResource := framework.Resource{
 		ScalarResources: make(map[corev1.ResourceName]int64),
 	}
-	allocatable := nodeClone.Allocatable
-	requested := nodeClone.Requested
+	allocatable := nodeClone.GetAllocatable()
+	requested := nodeClone.GetRequested()
 
-	leftResource.AllowedPodNumber = allocatable.AllowedPodNumber - len(nodeClone.Pods)
-	leftResource.MilliCPU = allocatable.MilliCPU - requested.MilliCPU
-	leftResource.Memory = allocatable.Memory - requested.Memory
-	leftResource.EphemeralStorage = allocatable.EphemeralStorage - requested.EphemeralStorage
+	leftResource.AllowedPodNumber = allocatable.GetAllowedPodNumber() - len(nodeClone.GetPods())
+	leftResource.MilliCPU = allocatable.GetMilliCPU() - requested.GetMilliCPU()
+	leftResource.Memory = allocatable.GetMemory() - requested.GetMemory()
+	leftResource.EphemeralStorage = allocatable.GetEphemeralStorage() - requested.GetEphemeralStorage()
 
-	for k, allocatableEx := range allocatable.ScalarResources {
-		requestEx, ok := requested.ScalarResources[k]
+	for k, allocatableEx := range allocatable.GetScalarResources() {
+		requestEx, ok := requested.GetScalarResources()[k]
 		if !ok {
 			leftResource.ScalarResources[k] = allocatableEx
 		} else {