feat: add noderesourcefitplus and scarceresourceavoidance scheduler p…

…lugis

Signed-off-by: LY-today <[email protected]>

cmd/koord-scheduler/main.go

@@ -31,7 +31,9 @@ import (
 	"github.com/koordinator-sh/koordinator/pkg/scheduler/plugins/elasticquota"
 	"github.com/koordinator-sh/koordinator/pkg/scheduler/plugins/loadaware"
 	"github.com/koordinator-sh/koordinator/pkg/scheduler/plugins/nodenumaresource"
+	noderesourcesfitplus "github.com/koordinator-sh/koordinator/pkg/scheduler/plugins/noderesourcefitplus"
 	"github.com/koordinator-sh/koordinator/pkg/scheduler/plugins/reservation"
+	"github.com/koordinator-sh/koordinator/pkg/scheduler/plugins/scarceresourceavoidance"
 
 	// Ensure metric package is initialized
 	_ "k8s.io/component-base/metrics/prometheus/clientgo"
@@ -40,13 +42,15 @@ import (
 )
 
 var koordinatorPlugins = map[string]frameworkruntime.PluginFactory{
-	loadaware.Name:        loadaware.New,
-	nodenumaresource.Name: nodenumaresource.New,
-	reservation.Name:      reservation.New,
-	coscheduling.Name:     coscheduling.New,
-	deviceshare.Name:      deviceshare.New,
-	elasticquota.Name:     elasticquota.New,
-	defaultprebind.Name:   defaultprebind.New,
+	loadaware.Name:               loadaware.New,
+	nodenumaresource.Name:        nodenumaresource.New,
+	reservation.Name:             reservation.New,
+	coscheduling.Name:            coscheduling.New,
+	deviceshare.Name:             deviceshare.New,
+	elasticquota.Name:            elasticquota.New,
+	defaultprebind.Name:          defaultprebind.New,
+	noderesourcesfitplus.Name:    noderesourcesfitplus.New,
+	scarceresourceavoidance.Name: scarceresourceavoidance.New,
 }
 
 func flatten(plugins map[string]frameworkruntime.PluginFactory) []app.Option {

pkg/scheduler/apis/config/register.go

@@ -40,6 +40,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&ElasticQuotaArgs{},
 		&CoschedulingArgs{},
 		&DeviceShareArgs{},
+		&NodeResourcesFitPlusArgs{},
+		&ScarceResourceAvoidanceArgs{},
 	)
 	return nil
 }

pkg/scheduler/apis/config/types.go

@@ -19,9 +19,11 @@ package config
 import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/kubernetes/pkg/scheduler/apis/config"
 	schedconfig "k8s.io/kubernetes/pkg/scheduler/apis/config"
 
 	"github.com/koordinator-sh/koordinator/apis/extension"
+	v1 "k8s.io/api/core/v1"
 )
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -237,3 +239,24 @@ type DeviceShareArgs struct {
 	// DisableDeviceNUMATopologyAlignment indicates device don't need to align with other resources' numa topology
 	DisableDeviceNUMATopologyAlignment bool
 }
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// ScarceResourceAvoidanceArgs defines the parameters for ScarceResourceAvoidance plugin.
+type ScarceResourceAvoidanceArgs struct {
+	metav1.TypeMeta
+	Resources []v1.ResourceName
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// NodeResourcesFitPlusArgs defines the parameters for NodeResourcesFitPlus plugin.
+type NodeResourcesFitPlusArgs struct {
+	metav1.TypeMeta
+	Resources map[v1.ResourceName]ResourcesType
+}
+
+type ResourcesType struct {
+	Type   config.ScoringStrategyType
+	Weight int64
+}

pkg/scheduler/apis/config/v1beta3/register.go

@@ -40,6 +40,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&ElasticQuotaArgs{},
 		&CoschedulingArgs{},
 		&DeviceShareArgs{},
+		&NodeResourcesFitPlusArgs{},
+		&ScarceResourceAvoidanceArgs{},
 	)
 	return nil
 }

pkg/scheduler/apis/config/v1beta3/types.go

@@ -22,6 +22,8 @@ import (
 	schedconfigv1beta3 "k8s.io/kube-scheduler/config/v1beta3"
 
 	"github.com/koordinator-sh/koordinator/apis/extension"
+	v1 "k8s.io/api/core/v1"
+	"k8s.io/kubernetes/pkg/scheduler/apis/config"
 )
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -232,3 +234,24 @@ type DeviceShareArgs struct {
 	// DisableDeviceNUMATopologyAlignment indicates device don't need to align with other resources' numa topology
 	DisableDeviceNUMATopologyAlignment bool `json:"disableDeviceNUMATopologyAlignment,omitempty"`
 }
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// ScarceResourceAvoidanceArgs defines the parameters for ScarceResourceAvoidance plugin.
+type ScarceResourceAvoidanceArgs struct {
+	metav1.TypeMeta
+	Resources []v1.ResourceName `json:"resources,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// NodeResourcesFitPlusArgs defines the parameters for NodeResourcesFitPlus plugin.
+type NodeResourcesFitPlusArgs struct {
+	metav1.TypeMeta
+	Resources map[v1.ResourceName]ResourcesType `json:"resources"`
+}
+
+type ResourcesType struct {
+	Type   config.ScoringStrategyType `json:"type"`
+	Weight int64                      `json:"weight"`
+}