Implement sakkara scheduler plugin

apis/config/register.go

@@ -45,6 +45,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&NetworkOverheadArgs{},
 		&SySchedArgs{},
 		&PeaksArgs{},
+		&ClusterTopologyPlacementGroupArgs{},
 	)
 	return nil
 }

apis/config/types.go

@@ -298,3 +298,13 @@ type PowerModel struct {
 	// Power = K0 + K1 * e ^(K2 * x) : where x is utilisation
 	// Idle power of node will be K0 + K1
 }
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// ClusterTopologyPlacementGroupArgs holds arguments used to configure ClusterTopologyPlacementGroup plugin.
+type ClusterTopologyPlacementGroupArgs struct {
+	metav1.TypeMeta
+
+	// Namespace where the cluster topology configmap is deployed
+	TopologyConfigMapNameSpace string
+}

apis/config/v1/defaults.go

@@ -102,6 +102,9 @@ var (
 	DefaultSySchedProfileNamespace = "default"
 	// DefaultSySchedProfileName is the name of the default syscall profile CR for SySched plugin
 	DefaultSySchedProfileName = "all-syscalls"
+
+	// DefaultTopologyConfigMapNameSpace is the default namespace for the cluster topology configmap
+	DefaultTopologyConfigMapNameSpace = "default"
 )
 
 // SetDefaults_CoschedulingArgs sets the default parameters for Coscheduling plugin.
@@ -250,3 +253,10 @@ func SetDefaults_SySchedArgs(obj *SySchedArgs) {
 		obj.DefaultProfileName = &DefaultSySchedProfileName
 	}
 }
+
+// SetDefaults_ClusterTopologyPlacementGroupArgs sets the default parameters for ClusterTopologyPlacementGroup plugin
+func SetDefaults_ClusterTopologyPlacementGroupArgs(args *ClusterTopologyPlacementGroupArgs) {
+	if args.TopologyConfigMapNameSpace == nil {
+		args.TopologyConfigMapNameSpace = &DefaultTopologyConfigMapNameSpace
+	}
+}

apis/config/v1/register.go

@@ -47,6 +47,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&NetworkOverheadArgs{},
 		&SySchedArgs{},
 		&PeaksArgs{},
+		&ClusterTopologyPlacementGroupArgs{},
 	)
 	return nil
 }

apis/config/v1/types.go

@@ -297,3 +297,14 @@ type PowerModel struct {
 	// Power = K0 + K1 * e ^(K2 * x) : where x is utilisation
 	// Idle power of node will be K0 + K1
 }
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +k8s:defaulter-gen=true
+
+// ClusterTopologyPlacementGroupArgs holds arguments used to configure ClusterTopologyPlacementGroup plugin.
+type ClusterTopologyPlacementGroupArgs struct {
+	metav1.TypeMeta `json:",inline"`
+
+	// Namespace where the cluster topology configmap is deployed
+	TopologyConfigMapNameSpace *string `json:"topologyConfigMapNameSpace,omitempty"`
+}

cmd/scheduler/main.go

@@ -33,6 +33,7 @@ import (
 	"sigs.k8s.io/scheduler-plugins/pkg/podstate"
 	"sigs.k8s.io/scheduler-plugins/pkg/preemptiontoleration"
 	"sigs.k8s.io/scheduler-plugins/pkg/qos"
+	"sigs.k8s.io/scheduler-plugins/pkg/sakkara"
 	"sigs.k8s.io/scheduler-plugins/pkg/sysched"
 	"sigs.k8s.io/scheduler-plugins/pkg/trimaran/loadvariationriskbalancing"
 	"sigs.k8s.io/scheduler-plugins/pkg/trimaran/lowriskovercommitment"
@@ -64,6 +65,7 @@ func main() {
 		// app.WithPlugin(crossnodepreemption.Name, crossnodepreemption.New),
 		app.WithPlugin(podstate.Name, podstate.New),
 		app.WithPlugin(qos.Name, qos.New),
+		app.WithPlugin(sakkara.Name, sakkara.New),
 	)
 
 	code := cli.Run(command)

go.mod

@@ -9,12 +9,14 @@ require (
 	github.com/dustin/go-humanize v1.0.1
 	github.com/go-logr/logr v1.4.2
 	github.com/google/go-cmp v0.6.0
+	github.com/ibm/chic-sched v0.0.0-20241119203507-1a05686d6d72
 	github.com/k8stopologyawareschedwg/noderesourcetopology-api v0.1.2
 	github.com/k8stopologyawareschedwg/podfingerprint v0.2.2
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/paypal/load-watcher v0.2.4
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.9.0
+	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
 	gonum.org/v1/gonum v0.12.0
 	k8s.io/api v0.31.2
 	k8s.io/apimachinery v0.31.2
@@ -112,7 +114,6 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
 	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
 	golang.org/x/mod v0.17.0 // indirect
 	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/oauth2 v0.21.0 // indirect

go.sum

@@ -2060,6 +2060,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
 github.com/ianlancetaylor/demangle v0.0.0-20240312041847-bd984b5ce465/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=
+github.com/ibm/chic-sched v0.0.0-20241119203507-1a05686d6d72 h1:bi8I4P8wkyqmGIzUf9MhPGJ3NAc+Qkxml3Xra38gpj0=
+github.com/ibm/chic-sched v0.0.0-20241119203507-1a05686d6d72/go.mod h1:aoGxO2hjXOu5ljdxMwYIS8n6hZXyF4pWhCp51kHm6Yo=
 github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=

manifests/install/charts/as-a-second-scheduler/values.yaml

@@ -30,7 +30,7 @@ controller:
 # as they need extra RBAC privileges on metrics.k8s.io.
 
 plugins:
-  enabled: ["Coscheduling","CapacityScheduling","NodeResourceTopologyMatch","NodeResourcesAllocatable"]
+  enabled: ["Coscheduling","CapacityScheduling","NodeResourceTopologyMatch","NodeResourcesAllocatable","ClusterTopologyPlacementGroup"]
   disabled: ["PrioritySort"] # only in-tree plugins need to be defined here
 
 # Customize the enabled plugins' config.

manifests/sakkara/cluster-topology.yaml

@@ -0,0 +1,26 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cluster-topology
+  namespace: sakkara-scheduler
+  labels:
+    "sakkara.topology": ""
+data:
+  name: "cluster-tree"
+  resource-names: |
+    [ "cpu", "memory", "nvidia.com/gpu" ]
+  level-names: |
+    [ "rack", "node" ]
+  tree: |
+    {
+      "rack-0": {
+        "node-0": {},
+        "node-1": {},
+        "node-2": {}
+      },
+      "rack-1": {
+        "node-3": {},
+        "node-4": {},
+        "node-5": {}
+      }
+    }